Bryan O'Sullivan <bos@serpentine.com> [Wed, 07 Nov 2007 17:06:02 -0800] rev 5510
convert: abstract map files into a class
Matt Mackall <mpm@selenic.com> [Wed, 07 Nov 2007 14:38:04 -0600] rev 5509
Mark failing test as a known bug
Bryan O'Sullivan <bos@serpentine.com> [Mon, 05 Nov 2007 13:20:24 -0800] rev 5508
Merge with -stable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 05 Nov 2007 08:41:22 +0100] rev 5507
Support qgoto in contrib/bash_completion.
bdowning@lavos.net [Sat, 03 Nov 2007 21:50:11 +0100] rev 5506
hgk: change config file from .gitk to .hgk
Git's gitk and Mercurial's hgk have diverged enough that their configuration information is no longer entirely compatible. Whenever I run one, the other gets reset to the default screen position. This patch changes hgk to store and read its configuration from ".hgk" instead of ".gitk", so as not to conflict with the "real" gitk anymore.
Patrick Mezard <pmezard@gmail.com> [Sat, 03 Nov 2007 17:06:44 +0100] rev 5505
Merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Fri, 02 Nov 2007 14:45:05 -0700] rev 5504
Merge with stable.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 02 Nov 2007 14:02:28 -0700] rev 5503
Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 02 Nov 2007 12:15:39 -0700] rev 5502
Merge with -stable.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 01 Nov 2007 15:22:22 -0700] rev 5501
Merge with crew.