Show More
| @@ -38,7 +38,7 b' a file, once as a link. Bundle was gener' | |||||
| 38 | Merge them and display *_ISLINK vars |
|
38 | Merge them and display *_ISLINK vars | |
| 39 | merge heads |
|
39 | merge heads | |
| 40 |
|
40 | |||
| 41 | $ hg merge --tool="$PYTHON ../echo.py" |
|
41 | $ hg merge --tool="\"$PYTHON\" ../echo.py" | |
| 42 | merging l |
|
42 | merging l | |
| 43 | HG_FILE l |
|
43 | HG_FILE l | |
| 44 | HG_MY_ISLINK 1 |
|
44 | HG_MY_ISLINK 1 | |
| @@ -54,7 +54,7 b' merge working directory' | |||||
| 54 | $ hg up -C 2 |
|
54 | $ hg up -C 2 | |
| 55 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
55 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 56 | $ hg copy l l2 |
|
56 | $ hg copy l l2 | |
| 57 | $ HGMERGE="$PYTHON ../echo.py" hg up 3 |
|
57 | $ HGMERGE="\"$PYTHON\" ../echo.py" hg up 3 | |
| 58 | merging l2 |
|
58 | merging l2 | |
| 59 | HG_FILE l2 |
|
59 | HG_FILE l2 | |
| 60 | HG_MY_ISLINK 1 |
|
60 | HG_MY_ISLINK 1 | |
General Comments 0
You need to be logged in to leave comments.
Login now