Sun, 03 Feb 2008 22:27:53 -0600 Steve Borho filemerge: two fixes for kdiff3 example configuration
Thu, 31 Jan 2008 22:32:11 -0600 Steve Borho add merge sections to hgrc.5
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall filemerge: remove the hgmerge script
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall filemerge: add an example set of global settings for common merge tools
(0) -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip