summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-07 09:10:11 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-07 13:17:50 -0700
commit6466fbbeef67ec398f6f5d5b5da5d6f107a647b2 (patch)
treedba6d1e8ddb52107c61ada62c14158ba40a33b03 /builtin/merge-tree.c
parentmailmap: update Pasky's address (diff)
parentGit 1.8.1.6 (diff)
downloadtgif-6466fbbeef67ec398f6f5d5b5da5d6f107a647b2.tar.xz
Sync with 1.8.1.6
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions