aboutsummaryrefslogtreecommitdiffstats
path: root/t/t4300-merge-tree.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2023-10-09merge-ort: initialize repo in index stateJohn Cai1-0/+27
2023-05-10merge-tree: load default git configDerrick Stolee1-0/+18
2021-10-12leak tests: mark some misc tests as passing with SANITIZE=leakÆvar Arnfjörð Bjarmason1-0/+2
2020-01-15t4300: abstract away SHA-1-specific constantsbrian m. carlson1-94/+94
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'SZEDER Gábor1-27/+7
2013-05-06merge-tree: handle directory/empty conflict correctlyJohn Keeping1-0/+51
2013-04-28merge-tree: fix typo in "both changed identically"John Keeping1-0/+13
2013-04-08merge-tree: don't print entries that match "local"John Keeping1-10/+0
2012-12-26merge-tree: fix d/f conflictsJunio C Hamano1-2/+2
2012-12-26merge-tree: add comments to clarify what these functions are doingJunio C Hamano1-0/+44
2010-07-14merge-tree: fix where two branches share no changesWill Palmer1-3/+3
2010-07-14add basic tests for merge-treeWill Palmer1-0/+257
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-08 21:12:16 +0000