Subject: Re: [PATCH v2 2/2] merge-file: correctly find files when called in subdir

From: Jonathan Nieder <[email-masked]>
Date: Sun, 17 Oct 2010 14:59:14 -0500

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.