summaryrefslogtreecommitdiffstats
path: root/t/t7605-merge-resolve.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt2024-11-211-1/+0
* unpack-file: fix ancient leak in create_temp_file()Ævar Arnfjörð Bjarmason2022-11-211-0/+1
* builtin/merge.c: fix a bug with trivial mergesElijah Newren2016-04-131-1/+1
* t7605: add a testcase demonstrating a bug with trivial mergesElijah Newren2016-04-131-1/+5
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-031-1/+1
* merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-241-1/+3
* Add a new test for git-merge-resolveMiklos Vajna2008-07-131-0/+46