summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-21 20:32:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-03-21 20:32:18 (GMT)
commita0feb1b1870fbb74f65d6a8951e4b2e2a2347ecf (patch)
treef91d383d4f11bd7f4b39f03b090d8d85976dc5f7 /builtin/merge.c
parent2ab5c88642e96b6cba17079d008531f5647d33cf (diff)
parentad52148a7d09152e8aa888f783e4878f6548b3a0 (diff)
downloadgit-a0feb1b1870fbb74f65d6a8951e4b2e2a2347ecf.zip
git-a0feb1b1870fbb74f65d6a8951e4b2e2a2347ecf.tar.gz
git-a0feb1b1870fbb74f65d6a8951e4b2e2a2347ecf.tar.bz2
Merge branch 'mm/doc-hooks-linkgit-fix' into maint
* mm/doc-hooks-linkgit-fix: Documentation: fix broken linkgit to git-config
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions