From: Andy Parkins Date: Wed, 25 Apr 2007 09:35:26 GMT Subject: git-ls-files -m lists the same file multiple times Message-ID: <200704251035.33713.andyparkins@gmail.com> Hello, 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. Andy -- Dr Andy Parkins, M Eng (hons), MIET andyparkins@gmail.com