summaryrefslogtreecommitdiff
path: root/tests/merge
ModeNameSize
-rw-r--r--analysis.c5864logplain
-rw-r--r--annotated_commit.c555logplain
-rw-r--r--conflict_data.h4981logplain
-rw-r--r--driver.c9373logplain
-rw-r--r--files.c13941logplain
-rw-r--r--merge_helpers.c10050logplain
-rw-r--r--merge_helpers.h2141logplain
d---------trees309logplain
d---------workdir259logplain