]> git.ozlabs.org Git - next-scripts/commit - do_merge
do_merge: Print if fixes exist when merge fails
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 18 Jun 2015 00:19:29 +0000 (10:19 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 19 Jun 2015 05:55:29 +0000 (15:55 +1000)
commit8ccc832bf6c7c29eb36396f0fc9e33dcfe037d64
tree223d2de3d9c29c986a879961150e8cf63511e8ca
parent7d763f860a5cfe6c023815be6ccd60ae565ca155
do_merge: Print if fixes exist when merge fails
do_merge