Mercurial > hg-stable
changeset 26895:fc41f9ffd4a4
test-merge-prompt.t: unset HGMERGE
We're going to test behavior with and without HGMERGE, so disable it for the
test.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 09 Nov 2015 22:37:32 -0800 |
| parents | 41957e50e109 |
| children | 5e46123e6c35 |
| files | tests/test-merge-prompt.t |
| diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-merge-prompt.t Tue Nov 10 23:02:59 2015 +0800 +++ b/tests/test-merge-prompt.t Mon Nov 09 22:37:32 2015 -0800 @@ -5,6 +5,9 @@ 840e2b315c1f: Fix misleading error and prompts during update/merge (issue556) +Make sure HGMERGE doesn't interfere with the test + $ unset HGMERGE + $ status() { > echo "--- status ---" > hg st -A file1 file2