diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-12-17 11:36:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-17 11:36:54 -0800 |
| commit | 212607494dee5f32667c548259e6347070312b4f (patch) | |
| tree | 80bdd2239f1315bbc173d9dcd74746f19f55e1d7 /builtin/merge-ours.c | |
| parent | Merge branch 'jj/doc-markup-gitcli' into maint (diff) | |
| parent | glossary-content.txt: fix documentation of "**" patterns (diff) | |
| download | tgif-212607494dee5f32667c548259e6347070312b4f.tar.xz | |
Merge branch 'nd/glossary-content-pathspec-markup' into maint
* nd/glossary-content-pathspec-markup:
glossary-content.txt: fix documentation of "**" patterns
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions