summaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
AgeCommit message (Expand)Author
2019-05-19Merge branch 'dl/difftool-mergetool'Junio C Hamano
2019-05-13difftool: fallback on merge.guitoolDenton Liu
2019-05-13difftool: make --gui, --tool and --extcmd mutually exclusiveDenton Liu
2019-03-18difftool: allow running outside Git worktrees with --no-indexJohannes Schindelin
2019-01-28parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWNNguyễn Thái Ngọc Duy
2018-11-13Merge branch 'js/mingw-utf8-env'Junio C Hamano
2018-10-31t7800: fix quotingJohannes Schindelin
2018-10-06t/*: fix ordering of expected/observed argumentsMatthew DeVore
2017-05-11tests: fix tests broken under GETTEXT_POISON=YesPleaseÆvar Arnfjörð Bjarmason
2017-04-14difftool: fix use-after-freeJohannes Schindelin
2017-03-15difftool: handle modified symlinks in dir-diff modeDavid Aguilar
2017-03-15t7800: cleanup cruft left behind by testsDavid Aguilar
2017-03-15t7800: remove whitespace before redirectDavid Aguilar
2017-02-08t7800: replace "wc -l" with test_line_countDavid Aguilar
2017-02-08Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanupJunio C Hamano
2017-02-08t7800: simplify basic usage testDavid Aguilar
2017-02-06difftool: fix bug when printing usageDavid Aguilar
2017-01-19difftool: retire the scripted versionJohannes Schindelin
2017-01-17difftool: add a skeleton for the upcoming builtinJohannes Schindelin
2016-12-08difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar
2016-08-15difftool: always honor fatal error exit codesJohn Keeping
2016-08-12Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano
2016-07-28difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar
2016-07-11Merge branch 'ak/t7800-wo-readlink' into maintJunio C Hamano
2016-06-21t7800: readlink may not be availableArmin Kunaschik
2016-05-23Merge branch 'da/difftool'Junio C Hamano
2016-05-16difftool: handle unmerged files in dir-diff modeDavid Aguilar
2016-05-03Merge branch 'nf/mergetool-prompt'Junio C Hamano
2016-04-25difftool/mergetool: make the form of yes/no questions consistentNikola Forró
2016-01-28mingw: work around pwd issues in the testsJohannes Schindelin
2015-12-11Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maintJunio C Hamano
2015-11-03Merge branch 'da/difftool'Junio C Hamano
2015-10-29difftool: ignore symbolic links in use_wt_fileDavid Aguilar
2015-09-08t7800: don't use test_config in a subshellJohn Keeping
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