log

age author description
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
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: add support for tool EOL fixups
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: allow smarter tool configuration
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall filemerge: pull file-merging code into its own module
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: move the bulk of simplemerge into core