git-meta merge should output file-level conflict information

[jhedwardyang]

Command:

git meta merge otherbranch

Output:

Submodule ts/foo/bar is conflicted.

Expected:

Merge conflict in ts/foo/bar/file1.
Merge conflict in ts/foo/bar/file2.