summaryrefslogtreecommitdiff
path: root/tests/merge/trees
ModeNameSize
-rw-r--r--automerge.c6862logplain
-rw-r--r--commits.c6117logplain
-rw-r--r--modeconflict.c2340logplain
-rw-r--r--recursive.c18217logplain
-rw-r--r--renames.c15075logplain
-rw-r--r--treediff.c23478logplain
-rw-r--r--trivial.c9626logplain
-rw-r--r--whitespace.c2181logplain