diff options
Diffstat (limited to 'git-merge-one-file.sh')
| -rwxr-xr-x | git-merge-one-file.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index 0f164e54c..57fad733b 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -118,8 +118,6 @@ case "${1:-.}${2:-.}${3:-.}" in ;; esac - # Be careful for funny filename such as "-L" in "$4", which - # would confuse "merge" greatly. git merge-file "$src1" "$orig" "$src2" ret=$? msg= |