summaryrefslogtreecommitdiff
path: root/exec_cmd.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-13 09:37:09 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-13 09:40:16 (GMT)
commitc884dd9a54fcde71ea125c86e6b6ab92acbbc7cf (patch)
tree20995b64343e548941ccb2e00796496dedb73149 /exec_cmd.h
parent4dc00021f784697e6d196ec285c8689d0777c533 (diff)
downloadgit-c884dd9a54fcde71ea125c86e6b6ab92acbbc7cf.zip
git-c884dd9a54fcde71ea125c86e6b6ab92acbbc7cf.tar.gz
git-c884dd9a54fcde71ea125c86e6b6ab92acbbc7cf.tar.bz2
octopus: allow criss-cross and clarify the message when it rejects
We rejected multi-base merge situations even though we used the same underlying multi-base git-read-tree as the resolve strategy uses. This was unneeded and did not add much to ensure the merge to be truly trivial, so remove this restriction and be more similar to what resolve does. Also when the merge did not trivially resolve, we rejected without stating that octopus strategy does not handle the situation. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'exec_cmd.h')
0 files changed, 0 insertions, 0 deletions