summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorWincent Colaiuta <win@wincent.com>2009-03-26 10:39:04 +0100
committerJunio C Hamano <gitster@pobox.com>2009-03-26 09:38:58 -0700
commit9fe00538c693929d4dec29690fe7660106fe056a (patch)
tree668b4ada1bd1856be21517332165679ccaebf337 /builtin-merge-recursive.c
parenteed1fcd76d8893ab687c700e1729faea025ba7a8 (diff)
downloadgit-9fe00538c693929d4dec29690fe7660106fe056a.tar.gz
Grammar fix for "git merge" man page
As spotted by the eagle eyes of Jeff King. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions