]> git.ozlabs.org Git - next-scripts/commit
do_merge: make sure we generate a merge commit for each nonempty tree
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Jun 2013 08:02:56 +0000 (18:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Jun 2013 08:02:56 +0000 (18:02 +1000)
commita62ab64ee1d72bb37ddf436aceab0feb4a3ec7f4
tree166b865a00d5d1402cdb20666cdc3c7867ef922b
parent98efc51cdd45ed8cd36858733a7a0f58e1a3d2bd
do_merge: make sure we generate a merge commit for each nonempty tree
do_merge