comparison tests/test-merge-criss-cross.t @ 26517:d8463a743d7d

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 bd625cd4e5e7
children a5ff66e6d77a
comparison
equal deleted inserted replaced
26516:eb9876aa8770 26517:d8463a743d7d
81 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 81 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922
82 preserving f2 for resolve of f2 82 preserving f2 for resolve of f2
83 f1: remote is newer -> g 83 f1: remote is newer -> g
84 getting f1 84 getting f1
85 f2: versions differ -> m 85 f2: versions differ -> m
86 picked tool 'internal:dump' for f2 (binary False symlink False) 86 picked tool ':dump' for f2 (binary False symlink False)
87 merging f2 87 merging f2
88 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c 88 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@40494bf2444c
89 1 files updated, 0 files merged, 0 files removed, 1 files unresolved 89 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
90 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 90 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
91 [1] 91 [1]