diff options
Diffstat (limited to 'contrib/examples')
| -rwxr-xr-x | contrib/examples/git-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index 8026ccff4a..e9588eec33 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -5,8 +5,8 @@ OPTIONS_KEEPDASHDASH= OPTIONS_SPEC="\ -git-merge [options] <remote>... -git-merge [options] <msg> HEAD <remote> +git merge [options] <remote>... +git merge [options] <msg> HEAD <remote> -- stat show a diffstat at the end of the merge n don't show a diffstat at the end of the merge |