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-merge-remove.out
changeset 6336 4b0c9c674707
parent 6299 653ddd1d7cd7
child 6512 368a4ec603cc
equal deleted inserted replaced
6335:e29557d687c9 6336:4b0c9c674707 
       
     1 created new head
 
     1 merging foo1 and foo
 
     2 merging foo1 and foo
 
     2 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
     3 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
     3 (branch merge, don't forget to commit)
 
     4 (branch merge, don't forget to commit)
 
     4 n   0         -2 bar
 
     5 n   0         -2 bar
 
     5 m 644         14 foo1
 
     6 m 644         14 foo1
hg-stable