Subject: [PATCH] Remove the dots at the end of file names

to make the output more mouse copy-paste friendly.

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>


---

 git-merge-one-file.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

fa0739c321265582ba8a914acedcb66f98980a86
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 7dee88a..5349a1c 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"
-- 
1.0.GIT