| commit | 69490f345943f6f6d7ae52e0e9c870e8b48a5dea | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Sep 2013 21:24:52 +0000 (5 14:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Sep 2013 21:24:52 +0000 (5 14:24 -0700) | ||
| tree | 2cb4ba93b2a6f409db00730f46c4fe024b82532e | treesnapshot (tar.gz zip) |
| parent | e5be297279e8ee8c503eb59da21ab17edc40e748 | commitdiff |
| parent | e45bda876ae2e39ac1e11ba1609f2c363ad4959a | commitdiff |
Merge branch 'maint-1.8.2' into maint-1.8.3
* maint-1.8.2:
Documentation/git-merge.txt: fix formatting of example block
* maint-1.8.2:
Documentation/git-merge.txt: fix formatting of example block
| Documentation/git-merge.txt | diff1 | diff2 | blobhistory |