summaryrefslogtreecommitdiff
path: root/tests/merge
ModeNameSize
-rw-r--r--analysis.c5864logplain
-rw-r--r--annotated_commit.c555logplain
-rw-r--r--conflict_data.h4705logplain
-rw-r--r--driver.c9262logplain
-rw-r--r--files.c12701logplain
-rw-r--r--merge_helpers.c10041logplain
-rw-r--r--merge_helpers.h2003logplain
d---------trees309logplain
d---------workdir259logplain