Mercurial > hg
diff hgeditor @ 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 | 1aee2ab0f902 |
children |