Merge branch 'release-2.140.91' into dev

[feisty_meow.git] / infobase / configuration / meld / binary_code_to_ignore.meld

diff --git a/infobase/configuration/meld/binary_code_to_ignore.meld b/infobase/configuration/meld/binary_code_to_ignore.meld
index 96d46328f34c7b472c1563580afe0916e719c90a..c425b92bac950ee8162debcfc91fa676d1a3e05c 100644 (file)
--- 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.ant 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,