Mercurial > hg

diff tests/test-inotify @ 10944:6f1894d6a6b0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: use working dir parent as ancestor for backward wdir merge I checked the tests, they were bogus in the first place
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 19 Apr 2010 20:41:53 +0200
parents 8939900073a8
children db9d16233787
line wrap: on
line diff
--- a/tests/test-inotify	Mon Apr 19 20:30:31 2010 +0200
+++ b/tests/test-inotify	Mon Apr 19 20:41:53 2010 +0200
@@ -82,7 +82,7 @@
 echo c >> a
 hg st
 
-hg up 0
+HGMERGE=internal:local hg up 0
 hg st
 
 HGMERGE=internal:local hg up