Mercurial > hg

comparison tests/test-graft.t @ 26517:d8463a743d7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: normalize 'internal:foo' names to ':foo' In upcoming patches we're going to present these names in the UI -- it would be good not to present deprecated names.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 00:01:16 -0700
parents d1530c6e8613
children a5ff66e6d77a
comparison
equal deleted inserted replaced
26516:eb9876aa8770 26517:d8463a743d7d
152 resolving manifests 152 resolving manifests
153 branchmerge: True, force: True, partial: False 153 branchmerge: True, force: True, partial: False
154 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 154 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
155 preserving b for resolve of b 155 preserving b for resolve of b
156 b: local copied/moved from a -> m 156 b: local copied/moved from a -> m
157 picked tool 'internal:merge' for b (binary False symlink False) 157 picked tool ':merge' for b (binary False symlink False)
158 merging b and a to b 158 merging b and a to b
159 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622 159 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
160 premerge successful 160 premerge successful
161 committing files: 161 committing files:
162 b 162 b
182 preserving e for resolve of e 182 preserving e for resolve of e
183 d: remote is newer -> g 183 d: remote is newer -> g
184 getting d 184 getting d
185 b: remote unchanged -> k 185 b: remote unchanged -> k
186 e: versions differ -> m 186 e: versions differ -> m
187 picked tool 'internal:merge' for e (binary False symlink False) 187 picked tool ':merge' for e (binary False symlink False)
188 merging e 188 merging e
189 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 189 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
190 warning: conflicts during merge. 190 warning: conflicts during merge.
191 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') 191 merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
192 abort: unresolved conflicts, can't continue 192 abort: unresolved conflicts, can't continue