summaryrefslogtreecommitdiff
path: root/t/t4020-diff-external.sh
AgeCommit message (Expand)Author
2014-03-14Merge branch 'tr/diff-submodule-no-reuse-worktree'Junio C Hamano
2014-02-18diff: do not reuse_worktree_file for submodulesThomas Rast
2013-12-06difftool: display the number of files in the diff queue in the promptZoltan Klinger
2013-10-29t: use perl instead of "$PERL_PATH" where applicableJeff King
2012-07-24Merge branch 'jv/maint-no-ext-diff'Junio C Hamano
2012-07-19diff: test precedence of external diff driversJeff King
2012-07-18diff: correctly disable external_diff with --no-ext-diffJunio C Hamano
2012-06-25tests: enclose $PERL_PATH in double quotesJunio C Hamano
2012-06-12t: Replace 'perl' by $PERL_PATHVincent van Ravesteijn
2011-04-24test: use $_z40 from test-libJunio C Hamano
2009-08-09tests: use "$TEST_DIRECTORY" instead of ".."Jeff King
2009-06-01diff: generate pretty filenames in prep_temp_blob()David Aguilar
2009-03-28Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'Junio C Hamano
2009-03-22diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano
2009-03-22Smudge the files fed to external diff and textconvJohannes Schindelin
2009-02-12Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesNazri Ramliy
2008-11-26Merge branch 'maint'Junio C Hamano
2008-11-26Teach "git diff" to honour --[no-]ext-diffJunio C Hamano
2008-08-17tests: use $TEST_DIRECTORY to refer to the t/ directoryJunio C Hamano
2008-03-13t4020: don't use grep -aJeff King
2008-03-13more tr portability test script fixesJeff King
2007-12-18the use of 'tr' in the test suite isn't really portableH.Merijn Brand
2007-07-07diff: honor binariness specified in attributesJunio C Hamano
2007-04-23Support 'diff=pgm' attributeJunio C Hamano