aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7605-merge-resolve.sh
AgeCommit message (Expand)AuthorFilesLines
2022-11-21unpack-file: fix ancient leak in create_temp_file()Ævar Arnfjörð Bjarmason1-0/+1
2016-04-12builtin/merge.c: fix a bug with trivial mergesElijah Newren1-1/+1
2016-04-12t7605: add a testcase demonstrating a bug with trivial mergesElijah Newren1-1/+5
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi1-1/+1
2008-08-23merge: fix numerus bugs around "trivial merge" areaJunio C Hamano1-1/+3
2008-07-13Add a new test for git-merge-resolveMiklos Vajna1-0/+46