summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-12-10 12:59:37 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-12-10 12:59:37 -0800
commit7d722536dd86b5fbd0c0434bfcea5588132ee6ad (patch)
tree991965b4fc69f66a3059076250add0fc0f7a1904 /builtin/merge.c
parentSync with maint (diff)
downloadtgif-7d722536dd86b5fbd0c0434bfcea5588132ee6ad.tar.xz
Git 2.7-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions