]> git.ozlabs.org Git - next-scripts/commit
do_merge: add the -c (continue) option
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 18 Jan 2023 23:56:19 +0000 (10:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 18 Jan 2023 23:56:19 +0000 (10:56 +1100)
commita0eace456c9973c00e4fdca4961ccb4bcbcda97c
treebe3b619c18200aab651a214bbba8fbd7af2ede6a
parentbf4ff5430d789261b54a90fb0789f14e372cda5c
do_merge: add the -c (continue) option

This starts mergeing again from where we left off i.e. the
tree after the last entry in the SHA`s file.
do_merge