diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-09-05 14:24:59 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-09-05 14:24:59 -0700 |
commit | b5699d17c3e04a022227fd95106e89f281417dcd (patch) | |
tree | 0e771a84698287b0bd16b5e251ee7dfe42eaa939 /contrib | |
parent | Merge git://github.com/git-l10n/git-po into maint (diff) | |
parent | Merge branch 'maint-1.8.2' into maint-1.8.3 (diff) | |
download | tgif-b5699d17c3e04a022227fd95106e89f281417dcd.tar.xz |
Merge branch 'maint-1.8.3' into maint
* maint-1.8.3:
Documentation/git-merge.txt: fix formatting of example block
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions