Brendan Cully <brendan@kublai.com> [Mon, 07 May 2007 08:42:48 -0700] rev 4411
Unconfuse font-lock
Brendan Cully <brendan@kublai.com> [Sun, 06 May 2007 20:27:45 -0700] rev 4410
Add fast-forward branch merging
Patrick Mezard <pmezard@gmail.com> [Mon, 07 May 2007 00:12:35 +0200] rev 4409
Merge with crew-stable.
HG: changed hgext/mq.py
Patrick Mezard <pmezard@gmail.com> [Sun, 06 May 2007 23:44:18 +0200] rev 4408
mq: fix qtop failure when the series ends with guarded patches.
Patrick Mezard <pmezard@gmail.com> [Sun, 06 May 2007 18:19:25 +0200] rev 4407
Test qtop breaking when series ends with guarded patches.
Patrick Mezard <pmezard@gmail.com> [Sun, 06 May 2007 16:40:53 +0200] rev 4406
simplemerge: flush stdout before writing to stderr.
Besides, stderr is not always unbuffered under win32 (when redirections occur for instance), and it should be flushed too.
Patrick Mezard <pmezard@gmail.com> [Sun, 06 May 2007 16:40:53 +0200] rev 4405
Move win32 find_in_files from util_win32 to util.
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:27:21 -0500] rev 4404
Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:26:21 -0500] rev 4403
Merge with crew-stable
Lee Cantey <lcantey@gmail.com> [Thu, 03 May 2007 14:09:09 -0700] rev 4402
Update Windows build instructions.
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4401
merge: reorganize some hunks in findcopies
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4400
merge: simplify a check in checkcopies
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4399
merge: expand and simplify the invalid handling for directory moves
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4398
merge: fix a bug detecting directory moves
When all the files in a directory are moved, it may be incorrectly marked as moved even if it contains subdirectories.
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4397
merge: clarify the findcopies code