index
:
git
master
git
Fast-forward packages
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
t
/
t4300-merge-tree.sh
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
t: remove TEST_PASSES_SANITIZE_LEAK annotations
Patrick Steinhardt
2024-11-21
1
-1
/
+0
*
merge-ort: initialize repo in index state
John Cai
2023-10-09
1
-0
/
+27
*
merge-tree: load default git config
Derrick Stolee
2023-05-10
1
-0
/
+18
*
leak tests: mark some misc tests as passing with SANITIZE=leak
Ævar Arnfjörð Bjarmason
2021-10-13
1
-0
/
+2
*
t4300: abstract away SHA-1-specific constants
brian m. carlson
2020-01-15
1
-94
/
+94
*
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
SZEDER Gábor
2018-08-21
1
-27
/
+7
*
merge-tree: handle directory/empty conflict correctly
John Keeping
2013-05-07
1
-0
/
+51
*
merge-tree: fix typo in "both changed identically"
John Keeping
2013-04-28
1
-0
/
+13
*
merge-tree: don't print entries that match "local"
John Keeping
2013-04-08
1
-10
/
+0
*
merge-tree: fix d/f conflicts
Junio C Hamano
2012-12-26
1
-2
/
+2
*
merge-tree: add comments to clarify what these functions are doing
Junio C Hamano
2012-12-26
1
-0
/
+44
*
merge-tree: fix where two branches share no changes
Will Palmer
2010-07-14
1
-3
/
+3
*
add basic tests for merge-tree
Will Palmer
2010-07-14
1
-0
/
+257