Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 18 Sep 2006 11:55:38 +0200] rev 3128
Merge with mainline
Mathieu Clabaut <mathieu.clabaut@systerel.fr> [Fri, 15 Sep 2006 22:55:17 +0200] rev 3127
Update [extdiff] configuration sample for vimdiff,
taking acount cmd.xxx and opts.xxx configurations item.
Matt Mackall <mpm@selenic.com> [Tue, 19 Sep 2006 14:58:54 -0500] rev 3126
filectx: add rename-aware ancestor algorithm
This code works but may trigger recursion depth issues
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:59:33 -0500] rev 3125
changectx: add ancestor function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:58:11 -0500] rev 3124
filectx: allow passing filelog in init to avoid opening new filelogs
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:38:06 -0500] rev 3123
filelog: make metadata method private
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 22:20:44 -0500] rev 3122
filectx: add rename traversal for parents()
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 21:27:30 -0500] rev 3121
merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 21:11:26 -0500] rev 3120
merge: simplify local created logic
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:43:06 -0500] rev 3119
merge: simplify prompt code
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:38:02 -0500] rev 3118
merge: simplify exec flag handling
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:18:27 -0500] rev 3117
merge: simplify tests for local changed/remote deleted
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:10:54 -0500] rev 3116
merge: more simplification of m2 manifest scanning
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:00:14 -0500] rev 3115
merge: reorder tests on m2 items in manifestmerge
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 19:54:01 -0500] rev 3114
merge: eliminate redundant security check
duplicated in applyupdates