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)