From: Johannes Sixt Date: Mon, 25 Mar 2013 10:59:12 GMT Subject: Re: [PATCH v2 3/3] t7800: run --dir-diff tests with and without symlinks Message-ID: <51502E00.7070904@viscovery.net> In-Reply-To: <20130325103516.GC2286@serenity.lan> Am 3/25/2013 11:35, schrieb John Keeping: > On Mon, Mar 25, 2013 at 08:26:52AM +0100, Johannes Sixt wrote: >> The series looks good, but I can't test it because it does not apply >> anywhere here. > > It's built on top of da/difftool-fixes, is there some problem that stops > it applying cleanly on top of that? Thanks. I had only tried trees that were "contaminated" by jk/difftool-dir-diff-edit-fix, which is in conflict with da/difftool-fixes. t7800 passes on Windows with these patches. -- Hannes