When you pass git-merge-cache the -o option, it tries to do all the
automatic merges and possibly return error if any of them failed, instead
of the default behaviour of failing immediately after the first failed
automatic merge.
Ported from the Cogito branch - Cogito needs this behaviour.
1) permissions aren't respected in the merge script (primarily because
they're never passed in to it in the first place). Fix that and also
check for permission conflicts in the merge
2) the delete of a file in both branches may indeed be just that, but it
could also be the indicator of a rename conflict (file moved to
different locations in both branches), so error out and ask the
committer for guidance.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
