X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=infobase%2Fconfiguration%2Fmeld%2Fbinary_code_to_ignore.meld;h=d82f6fa88834c20d5f2850f25fb6dc104564b77f;hb=5f16dc1ec3b4da532b272518d1cb8ea6dbc24e2f;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..d82f6fa8 100644 --- a/infobase/configuration/meld/binary_code_to_ignore.meld +++ b/infobase/configuration/meld/binary_code_to_ignore.meld @@ -13,7 +13,7 @@ in our list, open meld's settings via the menu path "Edit | Preferences | File F 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,