view tests/test-rebase-newancestor.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 49efeed49c94
children
line wrap: on
line source

adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@  3:AD 1d4e82ed3c2a
|
| o  2:C 7e1afe9214b2
| |
| o  1:B 0a6620c3c26a
|/
o  0:A 1e635d440a73

@  3:C 0c5887756284
|
o  2:B 4f208f4a1507
|
o  1:AD 1d4e82ed3c2a
|
o  0:A 1e635d440a73