@matheusbsbs / matheus-bagliano / commits / 31f883d1b8
Fork 0

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>

Alex Riesen committed Jan 5, 2006 at 12:46 UTC 31f883d1b8439b36d17ca79cf5eac992fb461f5a
1 file changed +2 -2
git-merge-one-file.sh
+2 -2
@@ -82,7 +82,7 @@ case "${1:-.}${2:-.}${3:-.}" in
82 expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
83 ;;
84 *)
85 - echo "Auto-merging $4."
85 + echo "Auto-merging $4"
86 orig=`git-unpack-file $1`
87 ;;
88 esac
@@ -107,7 +107,7 @@ case "${1:-.}${2:-.}${3:-.}" in
107 fi
108
109 if [ $ret -ne 0 ]; then
110 - echo "ERROR: Merge conflict in $4."
110 + echo "ERROR: Merge conflict in $4"
111 exit 1
112 fi
113 exec git-update-index -- "$4"