X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=infobase%2Fconfiguration%2Fmeld%2Fbinary_code_to_ignore.meld;h=c425b92bac950ee8162debcfc91fa676d1a3e05c;hb=afa692de4ad15489f09323a37396fccfa5991a9c;hp=0ca6afa48b48f415f8414eb240caa6acc430f6b9;hpb=0f49452f40415efb2a62048397ed8514a1058bb7;p=feisty_meow.git diff --git a/infobase/configuration/meld/binary_code_to_ignore.meld b/infobase/configuration/meld/binary_code_to_ignore.meld index 0ca6afa4..c425b92b 100644 --- a/infobase/configuration/meld/binary_code_to_ignore.meld +++ b/infobase/configuration/meld/binary_code_to_ignore.meld @@ -8,12 +8,12 @@ when meld does a comparison on our tree of java projects. the list provided below may or may not be useful to you, but some variant might be. to add a new filter that will get meld to ignore any files in any folder named -in our list, open meld's settings via the menu path "Edit | Preferences | File Filters". +in our list, open meld's settings via the menu path "Meld | Preferences | File Filters". once you're in that tab of the dialog, create a new filter called something like: binary-code and add these folder names as values for the filter: - bin bin.eclipse subprojects bin-eclipse codegen genned-src genned-obj unit-test-reports + bin.ant bin.eclipse subprojects bin-eclipse codegen genned-src genned-obj unit-test-reports any directory listed there will be ignored during comparisons and merges, which is more convenient than the alternative of seeing all the binaries that are different,