Mercurial > hg

comparison tests/test-merge1.out @ 3408:4e0c08f019b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with main
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 16 Oct 2006 09:23:26 +0200
parents d2b55e3c4e25
children 3109f012c305
comparison
equal deleted inserted replaced
3407:03e7e8958a27 3408:4e0c08f019b8
1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
2 %% no merges expected 2 %% no merges expected
3 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 (branch merge, don't forget to commit) 4 (branch merge, don't forget to commit)
5 diff -r d9e5953b9dec b 5 diff -r d9e5953b9dec b
6 --- /dev/null 6 --- /dev/null
7 +++ b/b 7 +++ b/b
8 @@ -0,0 +1,1 @@ 8 @@ -0,0 +1,1 @@
27 Contents of b should be "this is file b1" 27 Contents of b should be "this is file b1"
28 This is file b1 28 This is file b1
29 %% merge fails 29 %% merge fails
30 abort: outstanding uncommitted changes 30 abort: outstanding uncommitted changes
31 %% merge expected! 31 %% merge expected!
32 0 files updated, 1 files merged, 0 files removed, 0 files unresolved 32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
33 (branch merge, don't forget to commit) 33 (branch merge, don't forget to commit)
34 diff -r c1dd73cbf59f b 34 diff -r c1dd73cbf59f b
35 --- a/b 35 --- a/b
36 +++ b/b 36 +++ b/b
37 @@ -1,1 +1,1 @@ This is file b1 37 @@ -1,1 +1,1 @@ This is file b1