mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-21 19:46:09 +02:00
Code

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>
This commit is contained in:
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
;;
*)
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"