From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun, 17 Oct 2010 19:59:14 GMT
Subject: Re: [PATCH v2 2/2] merge-file: correctly find files when called in subdir
Message-ID: <20101017195914.GA3434@burratino>
In-Reply-To: <d0e540fdced31557e983d7503da3dcb75c622dc9.1287342969.git.trast@student.ethz.ch>

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.