--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-merge1.out	Tue Jun 21 18:41:57 2005 -0800
@@ -0,0 +1,78 @@
++ cat
++ chmod +x merge
++ mkdir t
++ cd t
++ 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
++ echo This is file b1
++ env HGMERGE=../merge hg update -m 1
++ cd ..
++ /bin/rm -rf t
++ mkdir t
++ cd t
++ 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
++ echo This is file b2
++ env HGMERGE=../merge hg update -m 1
+merging for b
+merging b
++ cd ..
++ /bin/rm -rf t
++ mkdir t
++ cd t
++ 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
++ echo This is file b22
++ hg commit -t 'commit #2' -d '0 0' -u user
++ hg update 1
++ echo This is file c1
++ hg add c
++ hg commit -t 'commit #3' -d '0 0' -u user
++ echo This is file b22
++ env HGMERGE=../merge hg update -m 2
++ cd ..
++ /bin/rm -rf t
++ mkdir t
++ cd t
++ 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
++ echo This is file b22
++ hg commit -t 'commit #2' -d '0 0' -u user
++ hg update 1
++ echo This is file c1
++ hg add c
++ hg commit -t 'commit #3' -d '0 0' -u user
++ echo This is file b33
++ env HGMERGE=../merge hg update -m 2
+merging for b
+merging b
++ cd ..
++ /bin/rm -rf t