diff hgmerge @ 3124:f145d04899d2

extdiff: use the default option only if the default program is used
author TK Soh <teekaysoh@yahoo.com>
date Mon, 18 Sep 2006 12:01:32 +0200
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff