# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-11-12 01:32:41
# Node ID fdfc50d09e8d59954c39ed63c16a6e7c886c33ec
# Parent  3309714ded262f1bb3e32dd552b01d6926de06d5

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.

diff --git a/tests/test-merge-prompt.t b/tests/test-merge-changedelete.t
rename from tests/test-merge-prompt.t
rename to tests/test-merge-changedelete.t