Fri, 18 Nov 2011 11:06:59 +0000 | Christian Ebert | Merge with stable | changeset | files |
Wed, 16 Nov 2011 18:04:19 -0600 | Matt Mackall | merge: give a special message for internal:merge failure (issue3105) | changeset | files |
Wed, 16 Nov 2011 12:55:59 +0000 | Christian Ebert | Merge with stable | changeset | files |