summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
AgeCommit message (Expand)Author
2014-11-14difftool: honor --trust-exit-code for builtin toolsDavid Aguilar
2014-10-28difftool: add support for --trust-exit-codeDavid Aguilar
2014-10-27difftool--helper: exit when reading a prompt answer failsJohannes Sixt
2014-04-21run_external_diff: clean up error handlingJeff King
2014-03-05t7800: add a difftool test for .git-filesJunio C Hamano
2013-05-29difftool --dir-diff: allow changing any clean working tree fileKenichi Saita
2013-05-17difftool: fix dir-diff when file does not exist in working treeJohn Keeping
2013-03-29t7800: run --dir-diff tests with and without symlinksJohn Keeping
2013-03-29t7800: fix tests when difftool uses --no-symlinksJohn Keeping
2013-03-29t7800: don't hide grep outputJohn Keeping
2013-03-29difftool: don't overwrite modified filesJohn Keeping
2013-03-29t7800: move '--symlinks' specific test to the endJohn Keeping
2013-03-28Merge branch 'jk/difftool-dir-diff-edit-fix'Junio C Hamano
2013-03-14difftool --dir-diff: symlink all files matching the working treeJohn Keeping
2013-02-21t7800: "defaults" is no longer a builtin tool nameDavid Aguilar
2013-02-21t7800: modernize testsDavid Aguilar
2013-02-20t7800: update copyright noticeDavid Aguilar
2012-09-25mergetool--lib: Allow custom commands to override built-insDavid Aguilar
2012-05-07Merge branch 'th/difftool-diffall'Junio C Hamano
2012-04-23difftool: print list of valid tools with '--tool-help'Tim Henigan
2012-04-23difftool: teach difftool to handle directory diffsTim Henigan
2012-03-23difftool: add '--no-gui' optionTim Henigan
2012-03-19t7800: Test difftool passing arguments to diffDavid Aguilar
2011-10-14t7800: avoid arithmetic expansion notationJunio C Hamano
2011-10-10git-difftool: allow skipping file by typing 'n' at promptSitaram Chamarty
2011-08-11test: consolidate definition of $LFJunio C Hamano
2010-10-06t7800 (difftool): add missing &&Elijah Newren
2010-08-18t/t7800-difftool.sh: Skip with prereq on no PERLÆvar Arnfjörð Bjarmason
2010-06-25tests: Skip tests in a way that makes sense under TAPÆvar Arnfjörð Bjarmason
2010-03-28difftool: Fix '--gui' when diff.guitool is unconfiguredDavid Aguilar
2010-01-23t7800-difftool.sh: Test mergetool.prompt fallbackDavid Aguilar
2010-01-16difftool: Update copyright notices to list each year separatelyDavid Aguilar
2010-01-15difftool: Use eval to expand '--extcmd' expressionsDavid Aguilar
2010-01-15difftool: Add '-x' and as an alias for '--extcmd'David Aguilar
2010-01-15t7800-difftool.sh: Simplify the --extcmd testDavid Aguilar
2010-01-10difftool: Allow specifying unconfigured commands with --extcmdDavid Aguilar
2010-01-10difftool--helper: Remove use of the GIT_MERGE_TOOL variableDavid Aguilar
2010-01-03git-difftool: Add '--gui' for selecting a GUI toolDavid Aguilar
2010-01-03t7800-difftool: Set a bogus tool for use by testsDavid Aguilar
2009-10-25t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT testMarkus Heidelberg
2009-04-24t7800: respect NO_PERLJeff King
2009-04-08difftool: add support for a difftool.prompt config variableDavid Aguilar
2009-04-08difftool: add various git-difftool testsDavid Aguilar
generated by cgit v0.10.2-6-g49f6 at 2024-04-16 23:40:09 (GMT)