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-up-local-change.out
changeset 3121 1c1e59aac82a
parent 3111 40e777bda455
child 3122 2ef0b3aae186
equal deleted inserted replaced
3120:b1de36a4b4df 3121:1c1e59aac82a 
    31 summary:     2
 
    31 summary:     2
 
    32 
    32 
    33 resolving manifests
 
    33 resolving manifests
 
    34  overwrite False branchmerge False partial False
 
    34  overwrite False branchmerge False partial False
 
    35  ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b
 
    35  ancestor 802f095af299 local 33aaa84a386b remote 33aaa84a386b
 
    36 remote deleted b
 
    36 remote deleted b, clobbering
 
    37 removing b
 
    37 removing b
 
    38 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    38 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
    39 changeset:   0:33aaa84a386b
 
    39 changeset:   0:33aaa84a386b
 
    40 user:        test
 
    40 user:        test
 
    41 date:        Mon Jan 12 13:46:40 1970 +0000
 
    41 date:        Mon Jan 12 13:46:40 1970 +0000
mercurial-crew-with-dirclash