Mercurial > hg
diff .hgsigs @ 26947:fdfc50d09e8d
test-merge-prompt.t: rename to test-merge-changedelete.t
Because:
(a) the only prompts we test in this file are change/delete prompts, and
(b) we're going to be expanding the scope of this test to cover future
improvements to change/delete conflicts, including avoiding prompts
altogether.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 11 Nov 2015 17:32:41 -0800 |
parents | a45821a808ab |
children | 7e1fac6c0a9c |