equal
deleted
inserted
replaced
1646 > --config ui.mergemarkers=basic \ |
1646 > --config ui.mergemarkers=basic \ |
1647 > merge -r 2 |
1647 > merge -r 2 |
1648 merging f |
1648 merging f |
1649 arg: "ll:working copy: tooltmpl ef83787e2614" |
1649 arg: "ll:working copy: tooltmpl ef83787e2614" |
1650 arg: "lo:" |
1650 arg: "lo:" |
1651 arg: "merge rev: tooltmpl 0185f4e0cf02" |
1651 arg: "merge rev: tooltmpl 0185f4e0cf02" |
1652 arg: "lb:base: */f~base.*" (glob) |
1652 arg: "lb:base: */f~base.*" (glob) |
1653 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1653 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1654 (branch merge, don't forget to commit) |
1654 (branch merge, don't forget to commit) |
1655 $ rm -f 'printargs_merge_tool' |
1655 $ rm -f 'printargs_merge_tool' |
1656 |
1656 |
1716 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
1716 > --config ui.mergemarkertemplate='uitmpl {rev}' \ |
1717 > --config ui.mergemarkers=detailed \ |
1717 > --config ui.mergemarkers=detailed \ |
1718 > merge -r 2 |
1718 > merge -r 2 |
1719 merging f |
1719 merging f |
1720 labellocal: "working copy: tooltmpl ef83787e2614" |
1720 labellocal: "working copy: tooltmpl ef83787e2614" |
1721 labelother: "merge rev: tooltmpl 0185f4e0cf02" |
1721 labelother: "merge rev: tooltmpl 0185f4e0cf02" |
1722 output (arg): "$TESTTMP/repo/f" |
1722 output (arg): "$TESTTMP/repo/f" |
1723 output (contents): |
1723 output (contents): |
1724 <<<<<<< working copy: tooltmpl ef83787e2614 |
1724 <<<<<<< working copy: tooltmpl ef83787e2614 |
1725 revision 1 |
1725 revision 1 |
1726 ======= |
1726 ======= |