summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-11 14:17:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-11 14:17:52 -0700
commitf7e2e592cf9bad03bc3adc44dcbe498b876dc808 (patch)
tree2d214c00d4a5ba5bc075f39ed0998fc9abff7a4e /resolve-undo.h
parentGit 2.10.1 (diff)
parentadd David Turner's Two Sigma address (diff)
downloadtgif-f7e2e592cf9bad03bc3adc44dcbe498b876dc808.tar.xz
Merge branch 'dt/mailinfo' into maint
* dt/mailinfo: add David Turner's Two Sigma address
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions