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-issue619.t
branchstable
changeset 23413 0c432696dae3
parent 15615 41885892796e
child 26420 2fc86d92c4a9
equal deleted inserted replaced
23412:94092019e839 23413:0c432696dae3 
    26 
    26 
    27   $ hg merge b
 
    27   $ hg merge b
 
    28   abort: merging with a working directory ancestor has no effect
 
    28   abort: merging with a working directory ancestor has no effect
 
    29   [255]
 
    29   [255]
 
    30 
    30 
       
    31 Even with strange revset (issue4465)
 
       
    32 
       
    33   $ hg merge ::.
 
       
    34   abort: merging with a working directory ancestor has no effect
 
       
    35   [255]
 
       
    36
hg-stable