| commit | b5699d17c3e04a022227fd95106e89f281417dcd | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Sep 2013 21:24:59 +0000 (5 14:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Sep 2013 21:24:59 +0000 (5 14:24 -0700) | ||
| tree | 0e771a84698287b0bd16b5e251ee7dfe42eaa939 | treesnapshot (tar.gz zip) |
| parent | eb76545715e375c163389bffa0f1a75c5537936c | commitdiff |
| parent | 69490f345943f6f6d7ae52e0e9c870e8b48a5dea | commitdiff |
Merge branch 'maint-1.8.3' into maint
* maint-1.8.3:
Documentation/git-merge.txt: fix formatting of example block
* maint-1.8.3:
Documentation/git-merge.txt: fix formatting of example block