On 3/25/07, Junio C Hamano <junkio@xxxxxxx> wrote:
Right. In the current system, git-mergetool might be a better place to add support for special perpose 3-version file-level merge backend than merge-recursive, at least until gitattributes materializes.
Would it be possible to have an env var (GIT_MERGE) that can be used to call an arbitrary script with merge/diff3 semantics instead of using the internal 3-way merge? That way we could do syntax-specific merges (ignore comments/whitespace, for example). i would surely have a use for it, as sometimes my internal team is not _that_ good about trimming whitespace, and we have merges that succeed except for their whitespace conflicts. cheers, martin - To unsubscribe from this list: 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