Andy Parkins <andyparkins@xxxxxxxxx> writes: > I did a merge, which had conflicts, and then fixed the conflicts. To see what > files I'd changed I did git-ls-files -m. This listed the same file multiple > times. Some of them twice and some of them three times. > > I guess that it's showing different stages; but as the list is just filename, > there is no way to tell which is which and it is just confusing. I did not imagine that anybody actually found 'ls-files -m' useful, either during a conflicted merge or under the normal situation. 'git diff --stat' is usually much more pleasant to see. Use 'ls-files -u' during conflicted merge and be happy. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html