summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/objects/60
ModeNameSize
-rw-r--r--61fe116ecba0800c26113ea1a7dfac2e16eeaf87logplain
-rw-r--r--91fc2c036a382a69489e3f518ee5aae9a4e567258logplain