diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-05 14:41:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-05 14:41:40 -0700 |
| commit | d2dbd399fa03b37ce797ed6fc609574a7e677079 (patch) | |
| tree | e594a762555b0afe94b675d5b57e55f5d54f64c3 /Makefile | |
| parent | 57e4c1783f056ce2d50a732c0fccff2a1fe99563 (diff) | |
| parent | 2ea3df68e881405940596b8c299921f681f8c22c (diff) | |
| download | git-d2dbd399fa03b37ce797ed6fc609574a7e677079.tar.gz git-d2dbd399fa03b37ce797ed6fc609574a7e677079.tar.xz | |
Sync with maint
* maint:
Documentation/git-merge.txt: fix formatting of example block
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions