gitignore: Ignore some more boring things.

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 7dee88a73370d9aa00e41ca290f2c6a589c77d90..5349a1c0fc54eb0b7feaf6192d20b6c6b2ab5e3b 100755 (executable)
--- a/git-merge-one-file.sh
+++ b/git-merge-one-file.sh
@@ -82,7 +82,7 @@ case "${1:-.}${2:-.}${3:-.}" in
                expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
                ;;
        *)
-               echo "Auto-merging $4."
+               echo "Auto-merging $4"
                orig=`git-unpack-file $1`
                ;;
        esac
@@ -107,7 +107,7 @@ case "${1:-.}${2:-.}${3:-.}" in
        fi
 
        if [ $ret -ne 0 ]; then
-               echo "ERROR: Merge conflict in $4."
+               echo "ERROR: Merge conflict in $4"
                exit 1
        fi
        exec git-update-index -- "$4"