File not showing on related location.
Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# added by them: app/etc/ local.xml~
#
File not showing on related location.
Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# added by them: app/etc/ local.xml~
#
Have you noted that there's a space at the beginning of the file name? Execute one of the following:
git add "app/etc/ local.xml~"
Or
git rm "app/etc/ local.xml~"