view tests/test-rebuildstate.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 ffeb926d57ce
children
line wrap: on
line source

adding bar
adding foo
% state dump after
n 666         -1 bar
n 666         -1 foo
% status
! bar
? baz
C foo