summaryrefslogtreecommitdiff
path: root/t/t6060-merge-index.sh
Commit message (Expand)AuthorAgeFilesLines
* unpack-file: fix ancient leak in create_temp_file()Ævar Arnfjörð Bjarmason2022-11-211-0/+2
* tests: use test_write_lines() to generate line-oriented outputEric Sunshine2021-12-131-3/+1
* tests: make use of the test_must_be_empty functionÆvar Arnfjörð Bjarmason2018-07-301-2/+1
* merge-one-file: fix broken merges with alternate work treesJeff King2011-04-291-2/+2
* add tests for merge-index / merge-one-fileJeff King2011-04-291-0/+100