summaryrefslogtreecommitdiff
path: root/t/t4108-apply-threeway.sh
AgeCommit message (Expand)AuthorFilesLines
2021-12-20git-apply: skip threeway in add / rename casesLibravatar Jerry Zhang1-0/+18
2021-09-05apply: resolve trivial merge without hitting ll-merge with "--3way"Libravatar Junio C Hamano1-0/+45
2021-04-07git-apply: allow simultaneous --cached and --3way optionsLibravatar Jerry Zhang1-0/+50
2021-04-06git-apply: try threeway first when "--3way" is usedLibravatar Jerry Zhang1-0/+20
2020-11-19t4*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-8/+8
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2019-10-24apply: respect merge.conflictStyle in --3wayLibravatar Denton Liu1-1/+1
2019-10-24t4108: demonstrate bug in applyLibravatar Denton Liu1-2/+11
2019-10-24t4108: use `test_config` instead of `git config`Libravatar Denton Liu1-1/+1
2019-10-24t4108: remove git command upstream of pipeLibravatar Denton Liu1-6/+7
2019-10-24t4108: replace create_file with test_write_linesLibravatar Denton Liu1-17/+10
2012-07-09apply: tests for the --3way optionLibravatar Junio C Hamano1-0/+54
2012-07-09apply: allow rerere() to work on --3way resultsLibravatar Junio C Hamano1-0/+25
2012-07-09apply: register conflicted stages to the indexLibravatar Junio C Hamano1-0/+78