Show More
@@ -221,21 +221,7 b' resolve <file> should re-merge file' | |||||
221 |
|
221 | |||
222 | test .orig behavior with resolve |
|
222 | test .orig behavior with resolve | |
223 |
|
223 | |||
224 |
$ hg resolve -q file1 --tool 'f --dump |
|
224 | $ hg resolve -q file1 --tool "sh -c 'f --dump \"$TESTTMP/repo/file1.orig\"'" | |
225 | */file1~base*: (glob) |
|
|||
226 | >>> |
|
|||
227 | foo |
|
|||
228 | <<< |
|
|||
229 | */file1~other*: (glob) |
|
|||
230 | >>> |
|
|||
231 | foo |
|
|||
232 | bar |
|
|||
233 | <<< |
|
|||
234 | $TESTTMP/repo/file1: (glob) |
|
|||
235 | >>> |
|
|||
236 | foo |
|
|||
237 | baz |
|
|||
238 | <<< |
|
|||
239 | $TESTTMP/repo/file1.orig: (glob) |
|
225 | $TESTTMP/repo/file1.orig: (glob) | |
240 | >>> |
|
226 | >>> | |
241 | foo |
|
227 | foo |
General Comments 0
You need to be logged in to leave comments.
Login now