Mon, 21 Apr 2014 19:53:19 +0200 merge: fix wrong number of arguments for bid merge message stable
Mads Kiilerich <madski@unity3d.com> [Mon, 21 Apr 2014 19:53:19 +0200] rev 21168
merge: fix wrong number of arguments for bid merge message
Mon, 21 Apr 2014 15:08:39 -0500 merge: fix test failures with new merge code on OS X stable
Matt Mackall <mpm@selenic.com> [Mon, 21 Apr 2014 15:08:39 -0500] rev 21167
merge: fix test failures with new merge code on OS X The case collision checker was missing a op entry for 'k'eep.
Sat, 19 Apr 2014 20:12:53 +0200 obsolete: fix one-element tuple in module docstring stable
Martin Geisler <martin@geisler.net> [Sat, 19 Apr 2014 20:12:53 +0200] rev 21166
obsolete: fix one-element tuple in module docstring
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip