octopus: allow criss-cross and clarify the message when it rejects
authorJunio C Hamano <junkio@cox.net>
Fri, 13 Jan 2006 09:37:09 +0000 (01:37 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 13 Jan 2006 09:40:16 +0000 (01:40 -0800)
commitc884dd9...54fcde71ea125c86e6b6ab92acbbc7cf
tree20995b6...343e548941ccb2e00796496dedb73149copy hash to clipboard (tree)
parent4dc0002...f784697e6d196ec285c8689d0777c533copy hash to clipboard (diff)
git-merge-octopus.sh