summaryrefslogtreecommitdiff
path: root/xdiff/xutils.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-07-24 14:31:23 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-07-24 14:31:23 -0700
commit6f9504c48ea59951a2aa3ee17e7c7fc36285e225 (patch)
treed1f2e19df808b09206c87944a811c4ad3f617311 /xdiff/xutils.c
parentRevert "git-am: add am.threeWay config variable" (diff)
downloadtgif-6f9504c48ea59951a2aa3ee17e7c7fc36285e225.tar.xz
RelNotes: am.threeWay does not exist (yet)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xutils.c')
0 files changed, 0 insertions, 0 deletions