Mercurial Mercurial > mercurial / 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-rename-merge1
changeset 3292 764688cf51e5
parent 3251 c93ce7f10f85
child 3853 c0b449154a90
equal deleted inserted replaced
3291:0b5d626b354e 3292:764688cf51e5 
    21 echo "merge"
 
    21 echo "merge"
 
    22 hg merge -y --debug
 
    22 hg merge -y --debug
 
    23 hg status -AC
 
    23 hg status -AC
 
    24 cat b
 
    24 cat b
 
    25 hg ci -m "merge" -d "0 0"
 
    25 hg ci -m "merge" -d "0 0"
 
       
    26 hg debugindex .hg/data/b.i
 
       
    27 hg debugrename b
mercurial