diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-06 01:24:59 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-06 01:24:59 +0400 |
| commit | b5699d17c3e04a022227fd95106e89f281417dcd (patch) | |
| tree | 0e771a84698287b0bd16b5e251ee7dfe42eaa939 /config.c | |
| parent | eb76545715e375c163389bffa0f1a75c5537936c (diff) | |
| parent | 69490f345943f6f6d7ae52e0e9c870e8b48a5dea (diff) | |
Merge branch 'maint-1.8.3' into maint
* maint-1.8.3:
Documentation/git-merge.txt: fix formatting of example block
Diffstat (limited to 'config.c')
0 files changed, 0 insertions, 0 deletions