summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
AgeCommit message (Expand)AuthorFilesLines
2013-03-29t7800: run --dir-diff tests with and without symlinksLibravatar John Keeping1-8/+19
2013-03-29t7800: fix tests when difftool uses --no-symlinksLibravatar John Keeping1-1/+1
2013-03-29t7800: don't hide grep outputLibravatar John Keeping1-27/+17
2013-03-29difftool: don't overwrite modified filesLibravatar John Keeping1-0/+30
2013-03-29t7800: move '--symlinks' specific test to the endLibravatar John Keeping1-15/+15
2013-03-28Merge branch 'jk/difftool-dir-diff-edit-fix'Libravatar Junio C Hamano1-0/+22
2013-03-14difftool --dir-diff: symlink all files matching the working treeLibravatar John Keeping1-0/+22
2013-02-21t7800: "defaults" is no longer a builtin tool nameLibravatar David Aguilar1-2/+2
2013-02-20t7800: modernize testsLibravatar David Aguilar1-198/+168
2013-02-19t7800: update copyright noticeLibravatar David Aguilar1-1/+1
2012-09-25mergetool--lib: Allow custom commands to override built-insLibravatar David Aguilar1-0/+11
2012-05-07Merge branch 'th/difftool-diffall'Libravatar Junio C Hamano1-0/+57
2012-04-23difftool: print list of valid tools with '--tool-help'Libravatar Tim Henigan1-0/+5
2012-04-23difftool: teach difftool to handle directory diffsLibravatar Tim Henigan1-0/+39
2012-03-23difftool: add '--no-gui' optionLibravatar Tim Henigan1-0/+13
2012-03-19t7800: Test difftool passing arguments to diffLibravatar David Aguilar1-0/+11
2011-10-14t7800: avoid arithmetic expansion notationLibravatar Junio C Hamano1-2/+2
2011-10-10git-difftool: allow skipping file by typing 'n' at promptLibravatar Sitaram Chamarty1-1/+42
2011-08-11test: consolidate definition of $LFLibravatar Junio C Hamano1-3/+0
2010-10-06t7800 (difftool): add missing &&Libravatar Elijah Newren1-6/+6
2010-08-18t/t7800-difftool.sh: Skip with prereq on no PERLLibravatar Ævar Arnfjörð Bjarmason1-27/+22
2010-06-25tests: Skip tests in a way that makes sense under TAPLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2010-03-28difftool: Fix '--gui' when diff.guitool is unconfiguredLibravatar David Aguilar1-0/+9
2010-01-22t7800-difftool.sh: Test mergetool.prompt fallbackLibravatar David Aguilar1-0/+12
2010-01-15difftool: Update copyright notices to list each year separatelyLibravatar David Aguilar1-1/+1
2010-01-15difftool: Use eval to expand '--extcmd' expressionsLibravatar David Aguilar1-0/+13
2010-01-15difftool: Add '-x' and as an alias for '--extcmd'Libravatar David Aguilar1-0/+8
2010-01-15t7800-difftool.sh: Simplify the --extcmd testLibravatar David Aguilar1-8/+5
2010-01-09difftool: Allow specifying unconfigured commands with --extcmdLibravatar David Aguilar1-1/+18
2010-01-09difftool--helper: Remove use of the GIT_MERGE_TOOL variableLibravatar David Aguilar1-9/+0
2010-01-03git-difftool: Add '--gui' for selecting a GUI toolLibravatar David Aguilar1-0/+12
2010-01-03t7800-difftool: Set a bogus tool for use by testsLibravatar David Aguilar1-1/+2
2009-10-24t7800-difftool: fix the effectless GIT_DIFFTOOL_PROMPT testLibravatar Markus Heidelberg1-1/+1
2009-04-24t7800: respect NO_PERLLibravatar Jeff King1-0/+5
2009-04-07difftool: add support for a difftool.prompt config variableLibravatar David Aguilar1-0/+64
2009-04-07difftool: add various git-difftool testsLibravatar David Aguilar1-0/+147
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 15:07:19 +0000