log

age author description
Mon, 04 Feb 2008 19:38:34 -0600 Steve Borho filemerge: wrap quotes around tool path
Mon, 04 Feb 2008 21:08:45 +0100 Christian Ebert keyword: nokwcommands, restricted string variables at top level
Mon, 04 Feb 2008 18:27:36 +0100 Christian Ebert keyword: split line continuation in 2 steps (style)
Mon, 04 Feb 2008 18:27:36 +0100 Christian Ebert keyword: add empty_ok argument to kwrepo.commit
Mon, 04 Feb 2008 18:27:36 +0100 Christian Ebert keyword: allow keyword expansion on clone
Tue, 05 Feb 2008 15:59:10 +0100 Thomas Arendsen Hein merge with crew-stable
Tue, 05 Feb 2008 15:54:42 +0100 Dirkjan Ochtman cleanly abort on unknown archive type (issue966)
Tue, 05 Feb 2008 14:34:46 +0100 Thomas Arendsen Hein merge with crew-stable
Tue, 05 Feb 2008 14:02:03 +0100 Dirkjan Ochtman hgweb: fix search skipping tip
Mon, 04 Feb 2008 09:56:01 -0600 dhruva filemerge: fix pattern matching
Sun, 03 Feb 2008 23:58:02 -0800 Lee Cantey filemerge: fix path to working file when fixeol is enabled
Mon, 04 Feb 2008 09:53:10 -0600 Matt Mackall mergetools: correct vim typo
Mon, 04 Feb 2008 09:51:56 -0600 Matt Mackall filemerge: handle missing regappend
Sun, 03 Feb 2008 23:08:16 -0800 Lee Cantey util_win32: add missing valname param to query_val function
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