aboutsummaryrefslogtreecommitdiff
path: root/contrib/mw-to-git
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-05 14:24:52 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-05 14:24:52 -0700
commit69490f345943f6f6d7ae52e0e9c870e8b48a5dea (patch)
tree2cb4ba93b2a6f409db00730f46c4fe024b82532e /contrib/mw-to-git
parente5be297279e8ee8c503eb59da21ab17edc40e748 (diff)
parente45bda876ae2e39ac1e11ba1609f2c363ad4959a (diff)
downloadgit-69490f345943f6f6d7ae52e0e9c870e8b48a5dea.tar.gz
git-69490f345943f6f6d7ae52e0e9c870e8b48a5dea.tar.xz
Merge branch 'maint-1.8.2' into maint-1.8.3
* maint-1.8.2: Documentation/git-merge.txt: fix formatting of example block
Diffstat (limited to 'contrib/mw-to-git')
0 files changed, 0 insertions, 0 deletions