diff options
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index f04240daca..b2d53752ae 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -312,6 +312,7 @@ do prompt=true ;; --) + shift break ;; -*) |