summaryrefslogtreecommitdiff
path: root/xdiff/xemit.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-12-19 11:33:56 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-12-19 11:33:56 -0800
commitd7c6c2369ac21141b7c6cceaebc6414ec3da14ad (patch)
tree9aa0b15668a5bffa1f05e766eebab1d3cbafb380 /xdiff/xemit.h
parentMerge branch 'en/merge-recursive-icase-removal' (diff)
parentdiff: support anchoring line(s) (diff)
downloadtgif-d7c6c2369ac21141b7c6cceaebc6414ec3da14ad.tar.xz
Merge branch 'jt/diff-anchored-patience'
"git diff" learned a variant of the "--patience" algorithm, to which the user can specify which 'unique' line to be used as anchoring points. * jt/diff-anchored-patience: diff: support anchoring line(s)
Diffstat (limited to 'xdiff/xemit.h')
0 files changed, 0 insertions, 0 deletions