]> git.ozlabs.org Git - next-scripts/commit
do_merge: Only build after conflicts
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 19 Jun 2015 05:40:20 +0000 (15:40 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 19 Jun 2015 05:55:29 +0000 (15:55 +1000)
commitee530a672414cd0de0d45e202fb407de251ab79c
tree2ba5f30802b648bf0e64adbe3a3b45e71bc2fef0
parent679110aaf162c8b023dc229c22cce2ae2d9c809f
do_merge: Only build after conflicts
do_merge