| 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
|
| 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
|
| Sun, 03 Feb 2008 21:47:07 -0200 |
Alexis S. L. Carvalho |
merge with crew-stable
|
| Sat, 02 Feb 2008 21:01:43 +0100 |
Thomas Arendsen Hein |
test-serve: wait before killing to always hide the "killed!" message.
|
| Sat, 02 Feb 2008 14:55:14 +0100 |
Thomas Arendsen Hein |
Mention 'hg update' to switch branches in help for branch and branches.
|
| Sat, 02 Feb 2008 14:49:31 +0100 |
Thomas Arendsen Hein |
Clarify help for hg status and make it consistent.
|
| Fri, 01 Feb 2008 13:31:46 -0800 |
Bryan O'Sullivan |
profile: expand PID in output file name
|
| Fri, 01 Feb 2008 13:11:03 -0800 |
Bryan O'Sullivan |
convert: allow synthetic history to be spliced in.
|
