Reimplement ListConflictFiles with git-merge-tree(1)
Reimplement the ListConflictFiles
RPC with git-merge-tree(1). We should be able to use the output as outlined in https://git-scm.com/docs/git-merge-tree#OUTPUT and parse the conflict files.
Reimplement the ListConflictFiles
RPC with git-merge-tree(1). We should be able to use the output as outlined in https://git-scm.com/docs/git-merge-tree#OUTPUT and parse the conflict files.