]> git.ozlabs.org Git - next-scripts/commit
merge_msg: Change it to take the conflicting commits and files
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 19 Jun 2015 05:50:41 +0000 (15:50 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 19 Jun 2015 05:55:29 +0000 (15:55 +1000)
commitd4e40036528a66aa9d82c9ec1045f125c1cb122a
tree06af678e22c088c3270b92fa57efbc806c5227e7
parent9e79c1ece7679500771ad57d6452eddee6525b2a
merge_msg: Change it to take the conflicting commits and files
merge_msg