From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 5 Jan 2006 11:46:16 +0000 (+0100)
Subject: trivial: remove the dots at the end of file names from merge-one-file
X-Git-Tag: v1.0.7^2~13
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=31f883d1b8439b36d17ca79cf5eac992fb461f5a;p=git.git

trivial: remove the dots at the end of file names from merge-one-file

to make the output more friendly to mouse copy-paste.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 7dee88a7..5349a1c0 100755
--- 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"