##// END OF EJS Templates
test-merge-prompt.t: unset HGMERGE...
Siddharth Agarwal -
r26895:fc41f9ff default
parent child Browse files
Show More
@@ -5,6 +5,9 b' b5605d88dc27: Make ui.prompt repeat on "'
5 840e2b315c1f: Fix misleading error and prompts during update/merge
5 840e2b315c1f: Fix misleading error and prompts during update/merge
6 (issue556)
6 (issue556)
7
7
8 Make sure HGMERGE doesn't interfere with the test
9 $ unset HGMERGE
10
8 $ status() {
11 $ status() {
9 > echo "--- status ---"
12 > echo "--- status ---"
10 > hg st -A file1 file2
13 > hg st -A file1 file2
General Comments 0
You need to be logged in to leave comments. Login now