summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-06-25 10:47:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-25 10:47:46 -0700
commitb5496cbd2291443b0ad0bf686db51fce6ffad863 (patch)
treef94de64568d0607ed1531920889dca82f877873a /fmt-merge-msg.h
parentNinth batch for 2.5 (diff)
parentRevert "diff-lib.c: adjust position of i-t-a entries in diff" (diff)
downloadtgif-b5496cbd2291443b0ad0bf686db51fce6ffad863.tar.xz
Merge branch 'nd/diff-i-t-a'
* nd/diff-i-t-a: Revert "diff-lib.c: adjust position of i-t-a entries in diff"
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions