]> git.ozlabs.org Git - next-scripts/commit
do_merge: updates
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Feb 2010 23:10:32 +0000 (10:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Feb 2010 23:10:32 +0000 (10:10 +1100)
commit6c2798193cc13b32ad2456109212421891c7afcc
tree9456e482793ffc88970648c54552851e04f28db6
parent9ce174d4edc7bd00ec1d3a4414788347ffca6db2
do_merge: updates
cope with / in branch names
don't stop if rerere fixed all the merge problems
auto apply merg fixup patches
do_merge