Re: [PATCH v3 4/4] t7800: "defaults" is no longer a builtin tool name

2013-02-21 Thread David Aguilar
On Wed, Feb 20, 2013 at 9:00 PM, Junio C Hamano wrote: > David Aguilar writes: > >> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh >> index fb00273..21fbba9 100755 >> --- a/t/t7800-difftool.sh >> +++ b/t/t7800-difftool.sh >> @@ -60,9 +60,9 @@ test_expect_success PERL 'custom commands' ' >

Re: [PATCH v3 4/4] t7800: "defaults" is no longer a builtin tool name

2013-02-20 Thread Junio C Hamano
David Aguilar writes: > diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh > index fb00273..21fbba9 100755 > --- a/t/t7800-difftool.sh > +++ b/t/t7800-difftool.sh > @@ -60,9 +60,9 @@ test_expect_success PERL 'custom commands' ' > ' > > test_expect_success PERL 'custom tool commands overri

Re: [PATCH v3 4/4] t7800: "defaults" is no longer a builtin tool name

2013-02-20 Thread Junio C Hamano
Thanks; will replace and queue. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH v3 4/4] t7800: "defaults" is no longer a builtin tool name

2013-02-20 Thread David Aguilar
073678b8e6324a155fa99f40eee0637941a70a34 reworked the mergetools/ directory so that every file corresponds to a difftool-supported tool. When this happened the "defaults" file went away as it was no longer needed by mergetool--lib. t7800 tests that configured commands can override builtins, but t