Show More
@@ -1358,7 +1358,7 b' mergemarkertemplate settings:' | |||||
1358 | arg: "ll:working copy" |
|
1358 | arg: "ll:working copy" | |
1359 | arg: "lo:" |
|
1359 | arg: "lo:" | |
1360 | arg: "merge rev" |
|
1360 | arg: "merge rev" | |
1361 |
arg: "lb:base: |
|
1361 | arg: "lb:base: */f~base.*" (glob) | |
1362 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1362 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
1363 | (branch merge, don't forget to commit) |
|
1363 | (branch merge, don't forget to commit) | |
1364 | $ rm -f 'printargs_merge_tool' |
|
1364 | $ rm -f 'printargs_merge_tool' | |
@@ -1388,7 +1388,7 b' mergemarkertemplate:' | |||||
1388 | arg: "ll:working copy: tooltmpl ef83787e2614" |
|
1388 | arg: "ll:working copy: tooltmpl ef83787e2614" | |
1389 | arg: "lo:" |
|
1389 | arg: "lo:" | |
1390 | arg: "merge rev: tooltmpl 0185f4e0cf02" |
|
1390 | arg: "merge rev: tooltmpl 0185f4e0cf02" | |
1391 |
arg: "lb:base: |
|
1391 | arg: "lb:base: */f~base.*" (glob) | |
1392 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
1392 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
1393 | (branch merge, don't forget to commit) |
|
1393 | (branch merge, don't forget to commit) | |
1394 | $ rm -f 'printargs_merge_tool' |
|
1394 | $ rm -f 'printargs_merge_tool' |
General Comments 0
You need to be logged in to leave comments.
Login now