comparison CONTRIBUTORS @ 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 c29efd272395
children
comparison
equal deleted inserted replaced
26894:41957e50e109 26895:fc41f9ffd4a4