diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-05 14:28:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-05 14:28:14 -0800 |
| commit | bb8cbe7861546a0646d38d7cd49dc245001ec5c5 (patch) | |
| tree | 926a5f279c1ab6036e440dd9813f3544aba2ec67 /t/t5515/fetch.br-config-explicit-merge | |
| parent | Merge branch 'cn/maint-rev-list-doc' into maint (diff) | |
| parent | Documentation/merge-options.txt: group "ff" related options together (diff) | |
| download | tgif-bb8cbe7861546a0646d38d7cd49dc245001ec5c5.tar.xz | |
Merge branch 'jc/doc-merge-options' into maint
* jc/doc-merge-options:
Documentation/merge-options.txt: group "ff" related options together
Diffstat (limited to 't/t5515/fetch.br-config-explicit-merge')
0 files changed, 0 insertions, 0 deletions