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-conflict.t
changeset 38341 50f5fc232c16
parent 35949 80e5210df25c
child 38965 cf68e2649e0a
equal deleted inserted replaced
38340:9abe91a503da 38341:50f5fc232c16 
    55   # 
    55   # 
    56   #     a
 
    56   #     a
 
    57   # 
    57   # 
    58   # To mark files as resolved:  hg resolve --mark FILE
 
    58   # To mark files as resolved:  hg resolve --mark FILE
 
    59   
    59   
    60   # To continue:                hg commit
 
    60   # To continue:    hg commit
 
    61   # To abort:                   hg update --clean .    (warning: this will discard uncommitted changes)
 
    61   # To abort:       hg update --clean . (warning: this will discard uncommitted changes)
 
    62   
    62   
    63 
    63 
    64   $ cat a
 
    64   $ cat a
 
    65   Small Mathematical Series.
 
    65   Small Mathematical Series.
 
    66   1
 
    66   1
mercurial