repo git: Strip rename indicators from conflict path names. Fixes #1459