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-prompt.out
changeset 6336 4b0c9c674707
parent 5764 8a5d8fb59ed2
child 8940 01ada7b1861d
equal deleted inserted replaced
6335:e29557d687c9 6336:4b0c9c674707 
     1 adding file1
 
     1 adding file1
 
     2 adding file2
 
     2 adding file2
 
     3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
     3 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
       
     4 created new head
 
     4 
     5 
     5 # non-interactive merge
 
     6 # non-interactive merge
 
     6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
     7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
     7 (branch merge, don't forget to commit)
 
     8 (branch merge, don't forget to commit)
 
     8 status:
 
     9 status:
hg-stable