summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-01 12:46:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-01 12:46:54 -0700
commit8c4e4ec3ff053331c845331645a437b01b1f0de6 (patch)
tree2eb332d5fa1ce82ba8d561ab3abb5bd27e2fcf6a /xdiff-interface.h
parentUpdate draft release notes to 1.8.4 (diff)
parentt7500: fix flipped actual/expect (diff)
downloadtgif-8c4e4ec3ff053331c845331645a437b01b1f0de6.tar.xz
Merge branch 'maint'
* maint: t7500: fix flipped actual/expect lib-rebase: document exec_ in FAKE_LINES
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions