Fix viewing and resolving conflicts of a submodule with a git-link-file containing...