Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 18 Sep 2006 17:43:31 +0200] rev 3126
fix warnings spotted by pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 18 Sep 2006 17:32:28 +0200] rev 3125
hgweb: fix errors spotted by pychecker
TK Soh <teekaysoh@yahoo.com> [Mon, 18 Sep 2006 12:01:32 +0200] rev 3124
extdiff: use the default option only if the default program is used
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 18 Sep 2006 11:55:38 +0200] rev 3123
Merge with mainline
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 21:27:30 -0500] rev 3122
merge: simplify actions with helper function
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 21:11:26 -0500] rev 3121
merge: simplify local created logic
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:43:06 -0500] rev 3120
merge: simplify prompt code
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:38:02 -0500] rev 3119
merge: simplify exec flag handling
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:18:27 -0500] rev 3118
merge: simplify tests for local changed/remote deleted
Matt Mackall <mpm@selenic.com> [Sun, 17 Sep 2006 20:10:54 -0500] rev 3117
merge: more simplification of m2 manifest scanning