equal
deleted
inserted
replaced
142 ? a/d |
142 ? a/d |
143 ? b/c.orig |
143 ? b/c.orig |
144 C b/a |
144 C b/a |
145 C b/b |
145 C b/b |
146 $ cat b/c |
146 $ cat b/c |
147 <<<<<<< local: f1c50ca4f127 - test: new file in target directory |
147 <<<<<<< working copy: f1c50ca4f127 - test: new file in target directory |
148 target |
148 target |
149 ======= |
149 ======= |
150 baz |
150 baz |
151 >>>>>>> other: ce36d17b18fb - test: 2 add a/c |
151 >>>>>>> merge rev: ce36d17b18fb - test: 2 add a/c |
152 $ rm b/c.orig |
152 $ rm b/c.orig |
153 |
153 |
154 Remote directory rename with conflicting file added in remote target directory |
154 Remote directory rename with conflicting file added in remote target directory |
155 and committed in local source directory. |
155 and committed in local source directory. |
156 |
156 |
175 R a/b |
175 R a/b |
176 R a/c |
176 R a/c |
177 ? a/d |
177 ? a/d |
178 ? b/c.orig |
178 ? b/c.orig |
179 $ cat b/c |
179 $ cat b/c |
180 <<<<<<< local: ce36d17b18fb - test: 2 add a/c |
180 <<<<<<< working copy: ce36d17b18fb - test: 2 add a/c |
181 baz |
181 baz |
182 ======= |
182 ======= |
183 target |
183 target |
184 >>>>>>> other: f1c50ca4f127 - test: new file in target directory |
184 >>>>>>> merge rev: f1c50ca4f127 - test: new file in target directory |
185 |
185 |
186 Second scenario with two repos: |
186 Second scenario with two repos: |
187 |
187 |
188 $ cd .. |
188 $ cd .. |
189 $ hg init r1 |
189 $ hg init r1 |