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-add.t
changeset 12399 4fee1fd3de9a
parent 12365 22f3353bcc36
child 13962 8b252e826c68
equal deleted inserted replaced
12398:2bc926ad65c2 12399:4fee1fd3de9a 
    67   M a
 
    67   M a
 
    68   ? a.orig
 
    68   ? a.orig
 
    69   $ hg resolve -m a
 
    69   $ hg resolve -m a
 
    70   $ hg ci -m merge
 
    70   $ hg ci -m merge
 
    71 
    71 
    72 issue683
 
    72 Issue683: peculiarity with hg revert of an removed then added file
 
    73 
    73 
    74   $ hg forget a
 
    74   $ hg forget a
 
    75   $ hg add a
 
    75   $ hg add a
 
    76   $ hg st
 
    76   $ hg st
 
    77   ? a.orig
 
    77   ? a.orig
mercurial