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-merge-commit.t
changeset 25125 bd625cd4e5e7
parent 21391 cb15835456cb
child 26517 d8463a743d7d
equal deleted inserted replaced
25124:d08a13215d1a 25125:bd625cd4e5e7 
    71   resolving manifests
 
    71   resolving manifests
 
    72    branchmerge: True, force: False, partial: False
 
    72    branchmerge: True, force: False, partial: False
 
    73    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
 
    73    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28
 
    74    preserving bar for resolve of bar
 
    74    preserving bar for resolve of bar
 
    75    bar: versions differ -> m
 
    75    bar: versions differ -> m
 
    76   updating: bar 1/1 files (100.00%)
 
       
    77   picked tool 'internal:merge' for bar (binary False symlink False)
 
    76   picked tool 'internal:merge' for bar (binary False symlink False)
 
    78   merging bar
 
    77   merging bar
 
    79   my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
 
    78   my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
 
    80    premerge successful
 
    79    premerge successful
 
    81   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
    80   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
   158   resolving manifests
 
   157   resolving manifests
 
   159    branchmerge: True, force: False, partial: False
 
   158    branchmerge: True, force: False, partial: False
 
   160    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
 
   159    ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0
 
   161    preserving bar for resolve of bar
 
   160    preserving bar for resolve of bar
 
   162    bar: versions differ -> m
 
   161    bar: versions differ -> m
 
   163   updating: bar 1/1 files (100.00%)
 
       
   164   picked tool 'internal:merge' for bar (binary False symlink False)
 
   162   picked tool 'internal:merge' for bar (binary False symlink False)
 
   165   merging bar
 
   163   merging bar
 
   166   my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
 
   164   my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
 
   167    premerge successful
 
   165    premerge successful
 
   168   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
   166   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
hg-stable