aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7800-difftool.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-12-04Merge branch 'ps/leakfixes-part-10'Junio C Hamano1-1/+0
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-11-13builtin/difftool: intialize some hashmap variablesSimon Marchi1-0/+4
2024-09-27builtin/difftool: plug several trivial memory leaksPatrick Steinhardt1-0/+1
2024-03-22t7800: use single quotes for test bodiesPatrick Steinhardt1-20/+20
2024-03-22t7800: improve test descriptions with empty argumentsPatrick Steinhardt1-8/+8
2024-02-20git-difftool--helper: honor `--trust-exit-code` with `--dir-diff`Patrick Steinhardt1-45/+54
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-2/+2
2023-04-05mergetool: new config guiDefault supports auto-toggling gui by DISPLAYTao Klerks1-0/+52
2022-10-06Sync with 2.33.5Taylor Blau1-0/+1
2022-10-06Sync with 2.32.4Taylor Blau1-0/+1
2022-10-06Sync with 2.30.6Taylor Blau1-0/+1
2022-10-01t/t7NNN: allow local submodulesTaylor Blau1-0/+1
2021-10-12Merge branch 'da/difftool-dir-diff-symlink-fix' into maintJunio C Hamano1-2/+65
2021-09-30difftool: create a tmpdir path without repeated slashesDavid Aguilar1-0/+7
2021-09-23Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftoolJunio C Hamano1-2/+65
2021-09-23difftool: fix symlink-file writing in dir-diff modeDavid Aguilar1-2/+65
2021-06-08t: fix whitespace around &&Andrei Rybak1-1/+1
2021-02-22difftool.c: learn a new way start at specified fileZheNing Hu1-0/+32
2021-02-10Merge branch 'sg/t7800-difftool-robustify'Junio C Hamano1-19/+19
2021-01-09t7800-difftool: don't accidentally match tmp dirsSZEDER Gábor1-19/+19
2020-11-19t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-20/+20
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-11-11t7800: simplify difftool testJinoh Kang1-19/+9
2020-11-06diff: allow passing NULL to diff_free_filespec_data()Jinoh Kang1-0/+23
2020-07-01difftool -d: ensure that intent-to-add files are handled correctlyJohannes Schindelin1-0/+8
2020-01-16t7800: don't rely on reuse_worktree_file()Jeff King1-3/+2
2019-05-19Merge branch 'dl/difftool-mergetool'Junio C Hamano1-0/+24
2019-05-13difftool: fallback on merge.guitoolDenton Liu1-0/+16
2019-05-13difftool: make --gui, --tool and --extcmd mutually exclusiveDenton Liu1-0/+8
2019-03-18difftool: allow running outside Git worktrees with --no-indexJohannes Schindelin1-0/+10
2019-01-27parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWNNguyễn Thái Ngọc Duy1-2/+2
2018-11-13Merge branch 'js/mingw-utf8-env'Junio C Hamano1-1/+1
2018-10-31t7800: fix quotingJohannes Schindelin1-1/+1
2018-10-07t/*: fix ordering of expected/observed argumentsMatthew DeVore1-1/+1
2017-05-11tests: fix tests broken under GETTEXT_POISON=YesPleaseÆvar Arnfjörð Bjarmason1-2/+2
2017-04-13difftool: fix use-after-freeJohannes Schindelin1-0/+19
2017-03-15difftool: handle modified symlinks in dir-diff modeDavid Aguilar1-0/+60
2017-03-15t7800: cleanup cruft left behind by testsDavid Aguilar1-1/+4
2017-03-15t7800: remove whitespace before redirectDavid Aguilar1-1/+1
2017-02-08t7800: replace "wc -l" with test_line_countDavid Aguilar1-12/+19
2017-02-08Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanupJunio C Hamano1-3/+41
2017-02-08t7800: simplify basic usage testDavid Aguilar1-8/+7
2017-02-06difftool: fix bug when printing usageDavid Aguilar1-0/+13
2017-01-19difftool: retire the scripted versionJohannes Schindelin1-48/+46
2017-01-17difftool: add a skeleton for the upcoming builtinJohannes Schindelin1-0/+2
2016-12-08difftool: fix dir-diff index creation when in a subdirectoryDavid Aguilar1-3/+41
2016-08-15difftool: always honor fatal error exit codesJohn Keeping1-0/+6
2016-08-12Merge branch 'jk/difftool-in-subdir' into maintJunio C Hamano1-0/+14
2016-07-28difftool: avoid $GIT_DIR and $GIT_WORK_TREEDavid Aguilar1-0/+14
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-06 20:06:37 +0000