diff options
Diffstat (limited to 'git-merge-one-file.sh')
| -rwxr-xr-x | git-merge-one-file.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index a93d0b4cd3..7e82facf91 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -124,9 +124,10 @@ case "${1:-.}${2:-.}${3:-.}" in git merge-file "$src1" "$orig" "$src2" ret=$? msg= - if test $ret != 0 + if test $ret != 0 || test -z "$1" then msg='content conflict' + ret=1 fi # Create the working tree file, using "our tree" version from the @@ -143,10 +144,6 @@ case "${1:-.}${2:-.}${3:-.}" in msg="${msg}permissions conflict: $5->$6,$7" ret=1 fi - if test -z "$1" - then - ret=1 - fi if test $ret != 0 then |