summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2016-06-29 16:31:03 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-29 12:43:44 -0700
commitfa90ab4a4512858662b4d712a7b01cce970057ef (patch)
tree5948c3c2e2ea2a02fc45fbe06aa04fb1dc5f467e /builtin/merge-file.c
parentrebase -i: add exec command to launch a shell command (diff)
downloadtgif-fa90ab4a4512858662b4d712a7b01cce970057ef.tar.xz
t3404: fix a grammo (commands are ran -> commands are run)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions