summaryrefslogtreecommitdiff
path: root/tests/merge/trees
ModeNameSize
-rw-r--r--automerge.c6857logplain
-rw-r--r--commits.c6117logplain
-rw-r--r--modeconflict.c2338logplain
-rw-r--r--recursive.c16341logplain
-rw-r--r--renames.c11076logplain
-rw-r--r--treediff.c23478logplain
-rw-r--r--trivial.c9621logplain
-rw-r--r--whitespace.c2179logplain