Mercurial Mercurial > hg-stable / 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-merge10.out
changeset 6512 368a4ec603cc
parent 6338 0750f11152fe
child 9611 a3d73b3e1f8a
equal deleted inserted replaced
6511:5c1bb5750558 6512:368a4ec603cc 
     6 adding manifests
 
     6 adding manifests
 
     7 adding file changes
 
     7 adding file changes
 
     8 added 1 changesets with 1 changes to 1 files (+1 heads)
 
     8 added 1 changesets with 1 changes to 1 files (+1 heads)
 
     9 (run 'hg heads' to see heads, 'hg merge' to merge)
 
     9 (run 'hg heads' to see heads, 'hg merge' to merge)
 
    10 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    10 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    11 merging testdir/subdir/a and testdir/a
 
    11 merging testdir/subdir/a and testdir/a to testdir/subdir/a
 
    12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
    12 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
    13 (branch merge, don't forget to commit)
 
    13 (branch merge, don't forget to commit)
 
    14 M testdir/subdir/a
 
    14 M testdir/subdir/a
 
    15 diff -r d02b3fc32762 testdir/subdir/a
 
    15 diff -r d02b3fc32762 testdir/subdir/a
 
    16 --- a/testdir/subdir/a
 
    16 --- a/testdir/subdir/a
hg-stable