| commit | d2dbd399fa03b37ce797ed6fc609574a7e677079 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Sep 2013 21:41:40 +0000 (5 14:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Sep 2013 21:41:40 +0000 (5 14:41 -0700) | ||
| tree | e594a762555b0afe94b675d5b57e55f5d54f64c3 | treesnapshot (tar.gz zip) |
| parent | 57e4c1783f056ce2d50a732c0fccff2a1fe99563 | commitdiff |
| parent | 2ea3df68e881405940596b8c299921f681f8c22c | commitdiff |
Sync with maint
* maint:
Documentation/git-merge.txt: fix formatting of example block
* maint:
Documentation/git-merge.txt: fix formatting of example block