Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 19:53:19 -0500] rev 3114
merge: eliminate confusing queued variable
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 18:28:50 -0500] rev 3113
merge: remove no longer possible clause
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 17:39:19 -0500] rev 3112
merge: move apply and dirstate code into separate functions
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 17:13:02 -0500] rev 3111
merge: remove linear variable
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 17:07:44 -0500] rev 3110
merge: simplify hook code
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:50:17 -0500] rev 3109
merge: linear_path -> linear
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:47:33 -0500] rev 3108
merge: pull manifest checks and updates into separate functions
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:13:34 -0500] rev 3107
merge: remove now unused umap dict
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:13:03 -0500] rev 3106
merge: pull manifest comparison out into separate function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 16:02:09 -0500] rev 3105
Merge with mainline