Mercurial > hg-stable
view tests/test-convert-bzr-114.out @ 11184:7d99edddbaea
extdiff: add labels, read diff arguments from [merge-tools]
hgtk has been using these same configs since Feb. Users only have to name the
tools they would like to use, ex:
[extdiff]
kdiff3 =
meld =
| author | Steve Borho <steve@borho.org> |
|---|---|
| date | Thu, 07 Jan 2010 22:19:05 -0600 |
| parents | 13b36eb14324 |
| children |
line wrap: on
line source
% replace file with dir initializing destination source-hg repository scanning source... sorting... converting... 2 add d file 1 replace with d dir 0 add d/a % manifest of tip 644 d/a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved