keep this in windows
git config --global core.autocrlf true
Try this
git config --global core.safecrlf false
to disable warning and keep it functioning.
now fatal error is gone
git merge -Xours mundo
keep this in windows
git config --global core.autocrlf true
Try this
git config --global core.safecrlf false
to disable warning and keep it functioning.
git merge -Xours mundo