Mercurial > hg
comparison tests/test-merge-tools.t @ 48802:92254dcd9255 stable
windows: adjust test output in test-merge-tools.t
Differential Revision: https://phab.mercurial-scm.org/D12216
| author | Raphaël Gomès <rgomes@octobus.net> |
|---|---|
| date | Fri, 18 Feb 2022 12:51:23 +0100 |
| parents | b70c9697ab41 |
| children | b10a944c0486 |
comparison
equal
deleted
inserted
replaced
| 48801:94635b74b18c | 48802:92254dcd9255 |
|---|---|
| 1590 > merge -r 2 | 1590 > merge -r 2 |
| 1591 merging f | 1591 merging f |
| 1592 arg: "ll:working copy" | 1592 arg: "ll:working copy" |
| 1593 arg: "lo:" | 1593 arg: "lo:" |
| 1594 arg: "merge rev" | 1594 arg: "merge rev" |
| 1595 arg: "lb:common ancestor: */f~base" (glob) | 1595 arg: "lb:common ancestor*/f~base" (glob) (no-windows !) |
| 1596 arg: "lb:common ancestor*\f~base" (glob) (windows !) | |
| 1596 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 1597 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 1597 (branch merge, don't forget to commit) | 1598 (branch merge, don't forget to commit) |
| 1598 $ rm -f 'printargs_merge_tool' | 1599 $ rm -f 'printargs_merge_tool' |
| 1599 | 1600 |
| 1600 Merge using a tool that supports labellocal, labelother, and labelbase, checking | 1601 Merge using a tool that supports labellocal, labelother, and labelbase, checking |
| 1620 > merge -r 2 | 1621 > merge -r 2 |
| 1621 merging f | 1622 merging f |
| 1622 arg: "ll:working copy: tooltmpl ef83787e2614" | 1623 arg: "ll:working copy: tooltmpl ef83787e2614" |
| 1623 arg: "lo:" | 1624 arg: "lo:" |
| 1624 arg: "merge rev: tooltmpl 0185f4e0cf02" | 1625 arg: "merge rev: tooltmpl 0185f4e0cf02" |
| 1625 arg: "lb:common ancestor: */f~base" (glob) | 1626 arg: "lb:common ancestor*/f~base" (glob) (no-windows !) |
| 1627 arg: "lb:common ancestor*\f~base" (glob) (windows !) | |
| 1626 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 1628 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| 1627 (branch merge, don't forget to commit) | 1629 (branch merge, don't forget to commit) |
| 1628 $ rm -f 'printargs_merge_tool' | 1630 $ rm -f 'printargs_merge_tool' |
| 1629 | 1631 |
| 1630 The merge tool still gets labellocal and labelother as 'basic' even when | 1632 The merge tool still gets labellocal and labelother as 'basic' even when |