Mercurial > hg-stable
view tests/test-diff-subdir @ 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 | 096f1c73cdc3 |
children |
line wrap: on
line source
#!/bin/sh hg init mkdir alpha touch alpha/one mkdir beta touch beta/two hg add alpha/one beta/two hg ci -m "start" -d "1000000 0" echo 1 > alpha/one echo 2 > beta/two echo EVERYTHING hg diff --nodates echo BETA ONLY hg diff --nodates beta echo INSIDE BETA cd beta hg diff --nodates .