diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:57:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-01 17:57:16 -0700 |
| commit | ffc5e3c958b66fb4babeba01483cc924bc2957a5 (patch) | |
| tree | 4cea1fc19bb4b720d04ac102c2a30f6dec864679 /userdiff.c | |
| parent | b966427b53b246e722df1e5502b9145eb9dd063a (diff) | |
| parent | 93e535a5b78c9861eca3e9371d1c3e5173c0ab02 (diff) | |
| download | git-ffc5e3c958b66fb4babeba01483cc924bc2957a5.tar.gz | |
Merge branch 'jc/merge-sans-branch'
* jc/merge-sans-branch:
merge: merge with the default upstream branch without argument
merge: match the help text with the documentation
Conflicts:
builtin/merge.c
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions