summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-09-28 19:19:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-28 19:19:34 -0700
commit22f698cb188243b313e024d618283e0293e37140 (patch)
tree469985f79455940a7dd7670e632ff18e1a86cce1 /builtin/merge-index.c
parentSync with v2.5.4 (diff)
downloadtgif-22f698cb188243b313e024d618283e0293e37140.tar.xz
Git 2.6.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions