Mercurial Mercurial > hg > mercurial-crew-with-dirclash / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge1.out
changeset 749 7e4843b7efd2
parent 430 5b22029b5aa2
child 801 1f9ec150a476
child 808 8f5637f0a0c0
child 814 0902ffece4b4 
--- a/tests/test-merge1.out
+++ b/tests/test-merge1.out
@@ -5,14 +5,14 @@
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
-+ hg commit -t 'commit #1' -d '0 0' -u user
++ hg commit -m 'commit #1' -d '0 0'
 + hg update 0
 + echo This is file c1
 + hg add c
-+ hg commit -t 'commit #2' -d '0 0' -u user
++ hg commit -m 'commit #2' -d '0 0'
 + echo This is file b1
 + env HGMERGE=../merge hg update -m 1
 + cd ..
@@ -22,14 +22,14 @@
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
-+ hg commit -t 'commit #1' -d '0 0' -u user
++ hg commit -m 'commit #1' -d '0 0'
 + hg update 0
 + echo This is file c1
 + hg add c
-+ hg commit -t 'commit #2' -d '0 0' -u user
++ hg commit -m 'commit #2' -d '0 0'
 + echo This is file b2
 + env HGMERGE=../merge hg update -m 1
 merging for b
@@ -41,16 +41,16 @@ merging b
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
-+ hg commit -t 'commit #1' -d '0 0' -u user
++ hg commit -m 'commit #1' -d '0 0'
 + echo This is file b22
-+ hg commit -t 'commit #2' -d '0 0' -u user
++ hg commit -m 'commit #2' -d '0 0'
 + hg update 1
 + echo This is file c1
 + hg add c
-+ hg commit -t 'commit #3' -d '0 0' -u user
++ hg commit -m 'commit #3' -d '0 0'
 + cat b
 This is file b1
 + echo This is file b22
@@ -64,16 +64,16 @@ merging b
 + hg init
 + echo This is file a1
 + hg add a
-+ hg commit -t 'commit #0' -d '0 0' -u user
++ hg commit -m 'commit #0' -d '0 0'
 + echo This is file b1
 + hg add b
-+ hg commit -t 'commit #1' -d '0 0' -u user
++ hg commit -m 'commit #1' -d '0 0'
 + echo This is file b22
-+ hg commit -t 'commit #2' -d '0 0' -u user
++ hg commit -m 'commit #2' -d '0 0'
 + hg update 1
 + echo This is file c1
 + hg add c
-+ hg commit -t 'commit #3' -d '0 0' -u user
++ hg commit -m 'commit #3' -d '0 0'
 + echo This is file b33
 + env HGMERGE=../merge hg update -m 2
 merging for b
mercurial-crew-with-dirclash