aboutsummaryrefslogtreecommitdiff
path: root/t/t7800-difftool.sh
AgeCommit message (Expand)Author
2026-01-04t7800: fix racy "difftool --dir-diff syncs worktree" testPaul Tarjan
2025-12-18t7800: work around the MSYS path conversion on WindowsJohannes Schindelin
2024-12-04Merge branch 'ps/leakfixes-part-10'Junio C Hamano
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt
2024-11-13builtin/difftool: intialize some hashmap variablesSimon Marchi
2024-09-27builtin/difftool: plug several trivial memory leaksPatrick Steinhardt
2024-03-22t7800: use single quotes for test bodiesPatrick Steinhardt
2024-03-22t7800: improve test descriptions with empty argumentsPatrick Steinhardt
2024-02-20git-difftool--helper: honor `--trust-exit-code` with `--dir-diff`Patrick Steinhardt
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano
2023-04-05mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks
2022-10-06Sync with 2.33.5Taylor Blau
2022-10-06Sync with 2.32.4Taylor Blau
2022-10-06Sync with 2.30.6Taylor Blau
2022-10-01t/t7NNN: allow local submodulesTaylor Blau
2021-10-12Merge branch 'da/difftool-dir-diff-symlink-fix' into maintJunio C Hamano
2021-09-30difftool: create a tmpdir path without repeated slashesDavid Aguilar
2021-09-23Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftoolJunio C Hamano
2021-09-23difftool: fix symlink-file writing in dir-diff modeDavid Aguilar
2021-06-08t: fix whitespace around &&Andrei Rybak
2021-02-22difftool.c: learn a new way start at specified fileZheNing Hu
2021-02-10Merge branch 'sg/t7800-difftool-robustify'Junio C Hamano
2021-01-09t7800-difftool: don't accidentally match tmp dirsSZEDER Gábor
2020-11-19t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-11-11t7800: simplify difftool testJinoh Kang
2020-11-06diff: allow passing NULL to diff_free_filespec_data()Jinoh Kang
2020-07-01difftool -d: ensure that intent-to-add files are handled correctlyJohannes Schindelin
2020-01-16t7800: don't rely on reuse_worktree_file()Jeff King
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-27parse-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-07t/*: fix ordering of expected/observed argumentsMatthew DeVore
2017-05-11tests: fix tests broken under GETTEXT_POISON=YesPleaseÆvar Arnfjörð Bjarmason
2017-04-13difftool: 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