Debian Codegraph @

tests/resources/mergedrepo/.gitted/MERGE_MSG

raw
1 Merge branch 'branch'
2
3 Conflicts:
4 conflicts-one.txt
5 conflicts-two.txt