Mercurial > hg
comparison tests/test-rename-merge2.out @ 3408:4e0c08f019b8
merge with main
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 16 Oct 2006 09:23:26 +0200 |
parents | d2b55e3c4e25 |
children | 9103dab96093 |
comparison
equal
deleted
inserted
replaced
3407:03e7e8958a27 | 3408:4e0c08f019b8 |
---|---|
90 rev: versions differ -> m | 90 rev: versions differ -> m |
91 a: remote copied -> m | 91 a: remote copied -> m |
92 copying a to b | 92 copying a to b |
93 merging rev | 93 merging rev |
94 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 | 94 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 |
95 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 95 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
96 (branch merge, don't forget to commit) | 96 (branch merge, don't forget to commit) |
97 -------------- | 97 -------------- |
98 M b | 98 M b |
99 a | 99 a |
100 C a | 100 C a |
108 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336 | 108 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336 |
109 b: local copied -> m | 109 b: local copied -> m |
110 rev: versions differ -> m | 110 rev: versions differ -> m |
111 merging rev | 111 merging rev |
112 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 | 112 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 |
113 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 113 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
114 (branch merge, don't forget to commit) | 114 (branch merge, don't forget to commit) |
115 -------------- | 115 -------------- |
116 M b | 116 M b |
117 a | 117 a |
118 C a | 118 C a |
128 rev: versions differ -> m | 128 rev: versions differ -> m |
129 copying a to b | 129 copying a to b |
130 removing a | 130 removing a |
131 merging rev | 131 merging rev |
132 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337 | 132 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337 |
133 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 133 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
134 (branch merge, don't forget to commit) | 134 (branch merge, don't forget to commit) |
135 -------------- | 135 -------------- |
136 M b | 136 M b |
137 a | 137 a |
138 -------------- | 138 -------------- |
145 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336 | 145 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336 |
146 b: local moved -> m | 146 b: local moved -> m |
147 rev: versions differ -> m | 147 rev: versions differ -> m |
148 merging rev | 148 merging rev |
149 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 | 149 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 |
150 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 150 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
151 (branch merge, don't forget to commit) | 151 (branch merge, don't forget to commit) |
152 -------------- | 152 -------------- |
153 M b | 153 M b |
154 a | 154 a |
155 -------------- | 155 -------------- |