summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-11-25 18:40:34 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-11-25 18:40:34 -0800
commited9fe755130891fc878bb2433204faffb534697b (patch)
tree9a560a6bde451f20eb37f1188ef3a1081cf536fc /builtin/merge.c
parentMerge branch 'jk/checkout-out-of-unborn' into maint (diff)
downloadtgif-ed9fe755130891fc878bb2433204faffb534697b.tar.xz
Git 1.8.0.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions