Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8738
merge: simplify a delete case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8737
merge: reorder get cases for future simplification
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8736
merge: fix prompt keep
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8735
merge: remove a flags case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8734
merge: pretend ancestor is local to simplify backwards and overwrite
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8733
merge: simplify flag merging code slightly
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8732
dirstate: eliminate reference cycle from normalize
Bound methods hold a reference to self, so assigning a bound method to
an instance unavoidably creates a cycle. Work around this by choosing
a normalize method at walk time instead. Eliminate default arg while
we're at it.
Henri Wiechers <hwiechers@gmail.com> [Sun, 07 Jun 2009 21:16:05 +0200] rev 8731
cleanup: removed unused imports
Martin Geisler <mg@lazybytes.net> [Mon, 08 Jun 2009 00:14:24 +0200] rev 8730
hgrc.5: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net> [Mon, 08 Jun 2009 00:13:58 +0200] rev 8729
hgignore.5: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net> [Mon, 08 Jun 2009 00:13:35 +0200] rev 8728
hg.1: wrap lines at 70 chars (whitespace cleanup)
timeless <timeless@gmail.com> [Sun, 07 Jun 2009 17:34:12 +0200] rev 8727
hgrc.5: language fixes
Christian Ebert <blacktrash@gmx.net> [Mon, 01 Jun 2009 02:17:57 +0200] rev 8726
hgrc.5: wrap manpage at 80 chars
Checked with asciidoc 8.4.5
Abderrahim Kitouni <a.kitouni@gmail.com> [Thu, 04 Jun 2009 21:24:29 +0100] rev 8725
bookmarks: update docstring
Brendan Cully <brendan@kublai.com> [Sat, 06 Jun 2009 15:38:03 -0700] rev 8724
Unbreak run-tests support for out-of-tree extensions
Brendan Cully <brendan@kublai.com> [Sat, 06 Jun 2009 13:37:41 -0700] rev 8723
Merge with crew-stable