summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@uchicago.edu>2008-07-03 00:08:12 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-05 11:24:39 -0700
commit56992f765d8e5eaa495f46e23f50b17ec1db725f (patch)
treea671402bb48e8a3de23fe2c0a9e3392daae97248 /git-merge-octopus.sh
parentmanpages: fix bogus whitespace (diff)
downloadtgif-56992f765d8e5eaa495f46e23f50b17ec1db725f.tar.xz
git(1): add comma
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions