зеркало из https://github.com/microsoft/git.git
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:
Родитель
50b4e0c178
Коммит
31f883d1b8
|
@ -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"
|
||||
|
|
Загрузка…
Ссылка в новой задаче