localrepo: Prepare MergeTree to support ListConflictFiles
Add changes to MergeTree
to prepare it to support ListConflictFiles.
Currently, MergeTree
only reads the conflicting filenames, and we need more information for using this function with ListConflictFiles
to replace Git2Go. So we extend this function to:
- Return the OID of the tree even if there are conflicts
- Add ConflictingFileInfo which holds additional information (see git-merge-tree(1)).
In the follow-up MR we will use this to add a new backend for ListConflictFiles.
Part of #4576 (closed)
Edited by Karthik Nayak