summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Nicolas Sebrecht <nicolas.s.dev@gmx.fr>2010-07-09 22:27:48 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-07-09 16:28:21 -0700
commit142183d09634aa00a47107c7ffc5e39fa6cbf1b0 (patch)
tree1c5ac235c183093419cd45d108eea26b8c2c5b54 /builtin/merge-file.c
parentt0005: work around strange $? in ksh when program terminated by a signal (diff)
downloadtgif-142183d09634aa00a47107c7ffc5e39fa6cbf1b0.tar.xz
checkout: accord documentation to what git does
Signed-off-by: Nicolas Sebrecht <nicolas.s.dev@gmx.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions