Accept all --theirs for file during merge (ikke testet mye)
git ls-files -u | sed -n 's,3\t,0\t,p' | git update-index --index-info
git checkout-index -af
git ls-files -u | sed -n 's,3\t,0\t,p' | git update-index --index-info
git checkout-index -af