tests/test-merge3.out
changeset 402 2fe8d66e3075
child 749 7e4843b7efd2
new file mode 100644
--- /dev/null
+++ b/tests/test-merge3.out
@@ -0,0 +1,9 @@
++ hg init
++ echo This is file a1
++ hg add a
++ hg commit -t 'commit #0' -d '0 0' -u user
++ touch b
++ hg add b
++ rm b
++ hg commit -A '-tcomment #1' -d '0 0' -u user
+b never committed!