I had seen something similar:
Merging linux-scsi into my own branches whereby both had a
particular patch (03aba2f79594ca94d159c8bab454de9bcc385b76),
git-merge complained that a resolve is needed.
After manually "resolving" the result was identical to
either branch (linux-scsi and my own), so in fact the
diff was 0.
I found this strange, but due to lack of time couldn't
pursue it further.
Luben
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html