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
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall filemerge: add config item for GUI tools
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: add registry look up bits to tool search
(0) -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip