1955 > --config ui.merge=testecho \ |
1955 > --config ui.merge=testecho \ |
1956 > --config ui.pre-merge-tool-output-template='\n{label("extmerge.running_merge_tool", "Running merge tool for {path} ({toolpath}):")}\n{separate("\n", extmerge_section(local), extmerge_section(base), extmerge_section(other))}\n' \ |
1956 > --config ui.pre-merge-tool-output-template='\n{label("extmerge.running_merge_tool", "Running merge tool for {path} ({toolpath}):")}\n{separate("\n", extmerge_section(local), extmerge_section(base), extmerge_section(other))}\n' \ |
1957 > --config 'templatealias.extmerge_section(sect)="- {pad("{sect.name} ({sect.label})", 20, left=True)}: {revset(sect.node)%"{rev}:{shortest(node,8)} {desc|firstline} {separate(" ", tags, bookmarks, branch)}"}"' |
1957 > --config 'templatealias.extmerge_section(sect)="- {pad("{sect.name} ({sect.label})", 20, left=True)}: {revset(sect.node)%"{rev}:{shortest(node,8)} {desc|firstline} {separate(" ", tags, bookmarks, branch)}"}"' |
1958 merging b |
1958 merging b |
1959 |
1959 |
1960 Running merge tool for b (*/bin/echo): (glob) |
1960 Running merge tool for b ("*/bin/echo.exe"): (glob) (windows !) |
|
1961 Running merge tool for b (*/bin/echo): (glob) (no-windows !) |
1961 - local (working copy): 10:2d1f533d add binary file (#2) tip default |
1962 - local (working copy): 10:2d1f533d add binary file (#2) tip default |
1962 - base (base): -1:00000000 default |
1963 - base (base): -1:00000000 default |
1963 - other (merge rev): 9:1e7ad7d7 add binary file (#1) default |
1964 - other (merge rev): 9:1e7ad7d7 add binary file (#1) default |
1964 merge runs here ... |
1965 merge runs here ... |
1965 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
1966 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |