Attempting to pull from git repo, but getting the following output. I think these files are tracked (As they should be), but its indicating that they are not. They are not i
If you simply want to delete the files like I do, you can run
rm `git merge 2>&1 | sed "s/^[^\t].*/ /g" `
(you might want to run it first with echo instead of rm to verify the results)