diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-19 19:32:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-19 19:35:55 -0800 |
| commit | efe05b019ca19328d27c07ef32b4698a7f36166f (patch) | |
| tree | a38d3c5713d39370e881c148ff0f5c9d4db59c67 /git-mergetool.sh | |
| parent | ec9f0ea3e6ecf1237223dec8428e7bb73d339320 (diff) | |
| parent | 718258e256b74622aa55f5ee0cb9cff4cce6bf9f (diff) | |
| download | git-efe05b019ca19328d27c07ef32b4698a7f36166f.tar.xz | |
Merge branch 'maint' to sync with GIT 1.6.0.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 94187c306c..d4078a6aff 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -296,6 +296,7 @@ do esac ;; --) + shift break ;; -*) |