diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-12-17 11:37:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-17 11:37:55 -0800 |
| commit | 5169f5a484e5a60af15b6270f344b5e6f966fa11 (patch) | |
| tree | 63ab748d741fad04f14ae3045346da9cd1ea3239 /builtin/merge-ours.c | |
| parent | Merge branch 'nd/glossary-content-pathspec-markup' into maint (diff) | |
| parent | Documentation: revamp git-cherry(1) (diff) | |
| download | tgif-5169f5a484e5a60af15b6270f344b5e6f966fa11.tar.xz | |
Merge branch 'tr/doc-git-cherry' into maint
* tr/doc-git-cherry:
Documentation: revamp git-cherry(1)
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions