summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-27 10:59:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-27 10:59:29 -0700
commit3d6586d100b0e91d08fa192d7070646584c2f1db (patch)
tree2bb9a357f3598ead3cac645f615664d3a344a35a /builtin/merge-recursive.c
parentMerge branch 'sb/t3600-rephrase' (diff)
parentdoc/config: grammar fixes for core.{editor,commentChar} (diff)
downloadtgif-3d6586d100b0e91d08fa192d7070646584c2f1db.tar.xz
Merge branch 'km/config-grammofix'
Doc update. * km/config-grammofix: doc/config: grammar fixes for core.{editor,commentChar}
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions