Skip to content

localrepo: Use `-z` flag for `git-merge-tree`

Karthik Nayak requested to merge 4576-reimplement-listconflictfiles-with-git-merge-tree-2 into master

Since we want to derive conflict information from git-merge-tree for ListConflictFiles. We should switch to using the -z flag. This provides machine parsable output.

Part of #4576 (closed)

Merge request reports