tests/test-merge4.out
changeset 416 5e9e8b8d2629
child 749 7e4843b7efd2
new file mode 100644
--- /dev/null
+++ b/tests/test-merge4.out
@@ -0,0 +1,15 @@
++ hg init
++ echo This is file a1
++ hg add a
++ hg commit -t 'commit #0' -d '0 0' -u user
++ echo This is file b1
++ hg add b
++ hg commit -t 'commit #1' -d '0 0' -u user
++ hg update 0
++ echo This is file c1
++ hg add c
++ hg commit -t 'commit #2' -d '0 0' -u user
++ hg update -m 1
++ rm b
++ echo This is file c22
++ hg commit -t 'commit #3' -d '0 0' -u user