# HG changeset patch
# User Greg Ward <greg-hg@gerg.ca>
# Date 2010-06-14 17:39:00
# Node ID e740f36cfb4bc8bfb24128866540406a135cc4ee
# Parent  4b81f82b03e3ef989160f4a4fa5ada429e1e9605

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-remove-new
rename from tests/test-merge3
rename to tests/test-remove-new
--- a/tests/test-merge3
+++ b/tests/test-remove-new
@@ -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-remove-new.out
rename from tests/test-merge3.out
rename to tests/test-remove-new.out