Replay already resolved merge conflicts in git
git --word-diff alias
git apply-ignore => rm-ignored