From afd064ea69dfd4d29bf1d9f524f24b67f6b7b5de Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 12 Jun 2014 10:21:41 -0400 Subject: [PATCH] gurps --- infobase/configuration/meld/binary_code_to_ignore.meld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infobase/configuration/meld/binary_code_to_ignore.meld b/infobase/configuration/meld/binary_code_to_ignore.meld index 0ca6afa4..96d46328 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 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, -- 2.34.1