| changeset 27026 | c93b44b79359 |
| parent 27010 | f4fec0940278 |
| child 27027 | a01ecbcfaf84 |
| 27025:ec37257341a9 | 27026:c93b44b79359 |
|---|---|
219 [1] |
219 [1] |
220 $ grep '<<<' file1 > /dev/null |
220 $ grep '<<<' file1 > /dev/null |
221 |
221 |
222 test .orig behavior with resolve |
222 test .orig behavior with resolve |
223 |
223 |
224 $ echo resolve > file |
|
225 $ hg resolve -q file1 --tool 'f --dump $TESTTMP/repo/file1.orig' |
224 $ hg resolve -q file1 --tool 'f --dump $TESTTMP/repo/file1.orig' |
226 */file1~base*: (glob) |
225 */file1~base*: (glob) |
227 >>> |
226 >>> |
228 foo |
227 foo |
229 <<< |
228 <<< |