Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 05 Feb 2008 14:02:03 +0100] rev 6017
hgweb: fix search skipping tip
dhruva <dhruvakm@gmail.com> [Mon, 04 Feb 2008 09:56:01 -0600] rev 6016
filemerge: fix pattern matching
Lee Cantey <lcantey@gmail.com> [Sun, 03 Feb 2008 23:58:02 -0800] rev 6015
filemerge: fix path to working file when fixeol is enabled
Matt Mackall <mpm@selenic.com> [Mon, 04 Feb 2008 09:53:10 -0600] rev 6014
mergetools: correct vim typo
Matt Mackall <mpm@selenic.com> [Mon, 04 Feb 2008 09:51:56 -0600] rev 6013
filemerge: handle missing regappend
Lee Cantey <lcantey@gmail.com> [Sun, 03 Feb 2008 23:08:16 -0800] rev 6012
util_win32: add missing valname param to query_val function
Steve Borho <steve@borho.org> [Sun, 03 Feb 2008 22:27:53 -0600] rev 6011
filemerge: two fixes for kdiff3 example configuration
Steve Borho <steve@borho.org> [Thu, 31 Jan 2008 22:32:11 -0600] rev 6010
add merge sections to hgrc.5
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.
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