Mercurial Mercurial > hg / changelog
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | zip | gz | bz2 | help
(0) -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Sun, 03 Feb 2008 19:29:05 -0600 filemerge: remove the hgmerge script
changeset
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6009
filemerge: remove the hgmerge script This is now better handled using [merge-tools] and [merge-patterns] in hgrc.
Sun, 03 Feb 2008 19:29:05 -0600 filemerge: add an example set of global settings for common merge tools
changeset
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6008
filemerge: add an example set of global settings for common merge tools
Sun, 03 Feb 2008 19:29:05 -0600 filemerge: add config item for GUI tools
changeset
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6007
filemerge: add config item for GUI tools <tool>.gui indicates whether a tool requires a GUI to run
Sun, 03 Feb 2008 19:29:05 -0600 merge: add registry look up bits to tool search
changeset
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6006
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
Mercurial