# apply crlf, or other cleanup filters (non-behavioural changes)
git reset --hard
find . -type f -exec touch {} \;
- git commit -a --amend -c HEAD || true # don't fail if nothing to commit
+ git commit -a --amend -C HEAD || true # don't fail if nothing to commit
echo "MERGING"
case ",`repoflags "$d"`," in
rmuntracked=true
elif [ x"$X" = x"-D" ]; then
killbranches=true
+ elif echo "$X" | grep '^-FFFF*UUUU*$' >/dev/null; then
+ msg ' _____'
+ msg ' ,--'\''-\P/`\ FFFFFFF'
+ msg ' __/_ B/,-.\ FFFFFFF'
+ msg ' / _\ (// O\\ FFFFFF'
+ msg '| (O `) _\._ _)\ FFFUU'
+ msg '| |___/.^d0~~"\ \ UUUU'
+ msg '| |`~'\'' \ | UUUU'
+ msg '| | __,C>|| UUUU'
+ msg '\ /_ ,-/,-'\'' | UUUU'
+ msg ' \\_ \_>~'\'' / UUUU-'
else
break
fi