Re: [PATCH v2 3/3] t7800: run --dir-diff tests with and without symlinks
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 25, 2013, 21:50 UTC
- Message-ID
- <7vobe7w3m9.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <51502E00.7070904@viscovery.net>
Johannes Sixt <j.sixt@viscovery.net> writes:
Show 10 quoted lines
> 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.
Yes, the conflict was unpleasant to deal with. John, I think what is queued on 'pu' is OK, but please double check after I push it out in a few hours.