[PATCH] tests: rename test-merge3 to test-add-remove

[Greg Ward]

# HG changeset patch
# User Greg Ward <greg-hg at gerg.ca>
# Date 1276537140 14400
# Node ID 07ba7f1dcd307e6fbd8f0f7c36ca78ac83fb18e6
# Parent  285bcf40e04bf8ec0980d3238a4d71e886054ed9
tests: rename test-merge3 to test-add-remove.

It tests that 'hg commit' does not crash if the user removes a newly
added file, which has nothing to do with merging.

diff --git a/tests/test-merge3 b/tests/test-add-remove
rename from tests/test-merge3
rename to tests/test-add-remove
--- a/tests/test-merge3
+++ b/tests/test-add-remove
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# test that 'hg commit' does not crash if the user removes a 
+# newly added file
+
 hg init
 echo This is file a1 > a
 hg add a
diff --git a/tests/test-merge3.out b/tests/test-add-remove.out
rename from tests/test-merge3.out
rename to tests/test-add-remove.out