GIT-ANNEX-RESOLVEMERGE(1) - manual page | User commands

Resolve merge conflicts.