Mercurial Mercurial > hg > mercurial-crew-with-dirclash / comparison
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 3002 a31557193f3c
parent 2175 b2ae81a7df29
child 3317 966632304dde
child 3328 49966b5ab16f
equal deleted inserted replaced
3001:ad558f297eb1 3002:a31557193f3c 
     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 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
     3 merging for b
 
       
     4 merging b
 
       
     5 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
     4 (branch merge, don't forget to commit)
 
     6 (branch merge, don't forget to commit)
 
     5 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
     7 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
     6 %% merge should fail
 
     8 %% merge should fail
 
     7 abort: 'b' already exists in the working dir and differs from remote
 
     9 abort: 'b' already exists in the working dir and differs from remote
 
     8 %% merge of b expected
 
    10 %% merge of b expected
mercurial-crew-with-dirclash