##// END OF EJS Templates
test-merge-prompt.t: unset HGMERGE...
test-merge-prompt.t: unset HGMERGE We're going to test behavior with and without HGMERGE, so disable it for the test.
Siddharth Agarwal -
r26895:fc41f9ff default
Show More
Name Size Modified Last Commit Author
/ contrib / plan9 / hgrc.d
9diff.rc Loading ...
9mail.rc Loading ...
factotum.rc Loading ...