summaryrefslogtreecommitdiff
path: root/tests/resources/merge-resolve/.gitted/objects/34
ModeNameSize
-rw-r--r--8dcd41e2b467991578e92bedd16971b877ef1e51logplain
-rw-r--r--bfafff88eaf118402b44e6f3e2dbbf1a582b05177logplain