octopus: allow manual resolve on the last round.
authorJunio C Hamano <junkio@cox.net>
Sat, 14 Jan 2006 00:45:42 +0000 (16:45 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 15 Jan 2006 01:21:38 +0000 (17:21 -0800)
commit98efc8f...d890a0c671b7e2000e43b2e0a96b9a73
treeac506f2...b4eebedb2731b0bc470a87e94d9dde51copy hash to clipboard (tree)
parent9e9b267...1a5ca7a257b3e1cfb319fe3e4efc663ccopy hash to clipboard (diff)
git-merge-octopus.sh