equal
deleted
inserted
replaced
97 $ hg up |
97 $ hg up |
98 note: possible conflict - b was renamed multiple times to: |
98 note: possible conflict - b was renamed multiple times to: |
99 b3 |
99 b3 |
100 b4 |
100 b4 |
101 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
101 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
102 |
|
103 Check for issue2642 |
|
104 |
|
105 $ hg init t |
|
106 $ cd t |
|
107 |
|
108 $ echo c0 > f1 |
|
109 $ hg ci -Aqm0 |
|
110 |
|
111 $ hg up null -q |
|
112 $ echo c1 > f1 # backport |
|
113 $ hg ci -Aqm1 |
|
114 $ hg mv f1 f2 |
|
115 $ hg ci -qm2 |
|
116 |
|
117 $ hg up 0 -q |
|
118 $ hg merge 1 -q --tool internal:local |
|
119 $ hg ci -qm3 |
|
120 |
|
121 $ hg merge 2 |
|
122 merging f1 and f2 to f2 |
|
123 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
124 (branch merge, don't forget to commit) |
|
125 |
|
126 $ cat f2 |
|
127 c0 |