Show More
@@ -1957,7 +1957,8 b' Check that the extra information is prin' | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now