Mercurial > hg > mercurial-source

changeset 27587:fdfc50d09e8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3309714ded26
children 067ab07435c9
files tests/test-merge-changedelete.t tests/test-merge-prompt.t
diffstat 1 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
rename from tests/test-merge-prompt.t
rename to tests/test-merge-changedelete.t