kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Alex Riesen 2006-01-05 12:46:16 +01:00 committed by Junio C Hamano
parent 50b4e0c178
commit 31f883d1b8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-merge-one-file.sh
View File

@ -82,7 +82,7 @@ case "${1:-.}${2:-.}${3:-.}" in
expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig
;; ;;
*) *)
echo "Auto-merging $4." echo "Auto-merging $4"
orig=`git-unpack-file $1` orig=`git-unpack-file $1`
;; ;;
esac esac
@ -107,7 +107,7 @@ case "${1:-.}${2:-.}${3:-.}" in
fi fi


if [ $ret -ne 0 ]; then if [ $ret -ne 0 ]; then
echo "ERROR: Merge conflict in $4." echo "ERROR: Merge conflict in $4"
exit 1 exit 1
fi fi
exec git-update-index -- "$4" exec git-update-index -- "$4"