Thomas Rast wrote: > This is a slight semantic change on Windows, because it now > substitutes / for \ in paths, but I suppose that's harmless? Yeah, I think it doesn't matter either way. cc-ing msysgit@ just in case. > builtin/merge-file.c | 7 ++++++- > t/t6023-merge-file.sh | 8 ++++++++ > 2 files changed, 14 insertions(+), 1 deletions(-) FWIW I still like both patches. -- 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