summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
AgeCommit message (Expand)AuthorFilesLines
2020-07-01difftool -d: ensure that intent-to-add files are handled correctlyLibravatar Johannes Schindelin1-0/+8
2020-01-16t7800: don't rely on reuse_worktree_file()Libravatar Jeff King1-3/+2
2019-05-19Merge branch 'dl/difftool-mergetool'Libravatar Junio C Hamano1-0/+24
2019-05-13difftool: fallback on merge.guitoolLibravatar Denton Liu1-0/+16
2019-05-13difftool: make --gui, --tool and --extcmd mutually exclusiveLibravatar Denton Liu1-0/+8
2019-03-18difftool: allow running outside Git worktrees with --no-indexLibravatar Johannes Schindelin1-0/+10
2019-01-27parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWNLibravatar Nguyễn Thái Ngọc Duy1-2/+2
2018-11-13Merge branch 'js/mingw-utf8-env'Libravatar Junio C Hamano1-1/+1
2018-10-31t7800: fix quotingLibravatar Johannes Schindelin1-1/+1
2018-10-07t/*: fix ordering of expected/observed argumentsLibravatar Matthew DeVore1-1/+1
2017-05-11tests: fix tests broken under GETTEXT_POISON=YesPleaseLibravatar Ævar Arnfjörð Bjarmason1-2/+2
2017-04-13difftool: fix use-after-freeLibravatar Johannes Schindelin1-0/+19
2017-03-15difftool: handle modified symlinks in dir-diff modeLibravatar David Aguilar1-0/+60
2017-03-15t7800: cleanup cruft left behind by testsLibravatar David Aguilar1-1/+4
2017-03-15t7800: remove whitespace before redirectLibravatar David Aguilar1-1/+1
2017-02-08t7800: replace "wc -l" with test_line_countLibravatar David Aguilar1-12/+19
2017-02-08Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanupLibravatar Junio C Hamano1-3/+41
2017-02-08t7800: simplify basic usage testLibravatar David Aguilar1-8/+7
2017-02-06difftool: fix bug when printing usageLibravatar David Aguilar1-0/+13
2017-01-19difftool: retire the scripted versionLibravatar Johannes Schindelin1-48/+46
2017-01-17difftool: add a skeleton for the upcoming builtinLibravatar Johannes Schindelin1-0/+2
2016-12-08difftool: fix dir-diff index creation when in a subdirectoryLibravatar David Aguilar1-3/+41
2016-08-15difftool: always honor fatal error exit codesLibravatar John Keeping1-0/+6
2016-08-12Merge branch 'jk/difftool-in-subdir' into maintLibravatar Junio C Hamano1-0/+14
2016-07-28difftool: avoid $GIT_DIR and $GIT_WORK_TREELibravatar David Aguilar1-0/+14
2016-07-11Merge branch 'ak/t7800-wo-readlink' into maintLibravatar Junio C Hamano1-1/+1
2016-06-21t7800: readlink may not be availableLibravatar Armin Kunaschik1-1/+1
2016-05-23Merge branch 'da/difftool'Libravatar Junio C Hamano1-0/+23
2016-05-16difftool: handle unmerged files in dir-diff modeLibravatar David Aguilar1-0/+23
2016-05-03Merge branch 'nf/mergetool-prompt'Libravatar Junio C Hamano1-1/+1
2016-04-25difftool/mergetool: make the form of yes/no questions consistentLibravatar Nikola Forró1-1/+1
2016-01-28mingw: work around pwd issues in the testsLibravatar Johannes Schindelin1-7/+7
2015-12-11Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintLibravatar Junio C Hamano1-4/+4
2015-11-03Merge branch 'da/difftool'Libravatar Junio C Hamano1-0/+19
2015-10-29difftool: ignore symbolic links in use_wt_fileLibravatar David Aguilar1-0/+19
2015-09-08t7800: don't use test_config in a subshellLibravatar John Keeping1-4/+4
2014-11-14difftool: honor --trust-exit-code for builtin toolsLibravatar David Aguilar1-0/+5
2014-10-28difftool: add support for --trust-exit-codeLibravatar David Aguilar1-0/+43
2014-10-27difftool--helper: exit when reading a prompt answer failsLibravatar Johannes Sixt1-0/+8
2014-04-21run_external_diff: clean up error handlingLibravatar Jeff King1-1/+1
2014-03-05t7800: add a difftool test for .git-filesLibravatar Junio C Hamano1-0/+14
2013-05-29difftool --dir-diff: allow changing any clean working tree fileLibravatar Kenichi Saita1-0/+19
2013-05-17difftool: fix dir-diff when file does not exist in working treeLibravatar John Keeping1-0/+7
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 16:39:51 +0000