diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-05 20:52:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-05 20:52:50 -0800 |
| commit | 92e802c6ccb96d1b5e8561b0a136d43d82253293 (patch) | |
| tree | 9b6c265d69d1dc8bcce36c86a44674cfb010a6d7 /git-merge-one-file.sh | |
| parent | 17dff84b5e745ba17a5b3ae5591d79f96b165d48 (diff) | |
| parent | c1fe2fe4fe685e0587c3949f953aab726de88994 (diff) | |
| download | git-92e802c6ccb96d1b5e8561b0a136d43d82253293.tar.gz | |
GIT 1.0.7v1.0.7
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-one-file.sh')
| -rwxr-xr-x | git-merge-one-file.sh | 4 |
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" |