summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2006-01-05 12:46:16 +0100
committerJunio C Hamano <junkio@cox.net>2006-01-05 17:23:41 -0800
commit31f883d1b8439b36d17ca79cf5eac992fb461f5a (patch)
tree421f852c81643e3a6011865b231b8537d077542c /git-merge-one-file.sh
parent50b4e0c178777a27164eb67676593255a9cbd035 (diff)
downloadgit-31f883d1b8439b36d17ca79cf5eac992fb461f5a.tar.gz
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>
Diffstat (limited to 'git-merge-one-file.sh')
-rwxr-xr-xgit-merge-one-file.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh
index 7dee88a733..5349a1c0fc 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"