Commits

Greg Ward  committed 277c767

Fix so test-hg passes with Mercurial 1.5.
("hg merge --tool" doesn't work in 1.5, so fallback to the older
HGMERGE environment variable.)

  • Participants
  • Parent commits 8379133

Comments (0)

Files changed (1)

File tests/test-hg

     assert_vcprompt "show rev 2" "[2]" "[%r]"
 
     hg -q update default
-    hg -q merge --tool internal:other stable
+    HGMERGE=internal:other hg -q merge stable
     assert_vcprompt "show branch 3" "default" "%b"
     assert_vcprompt "show rev 3" "[1,2]" "[%r]"