Merge branch 'jt/diff-anchored-patience'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Dec 2017 19:33:56 +0000 (11:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Dec 2017 19:33:56 +0000 (11:33 -0800)
commitd7c6c2369ac21141b7c6cceaebc6414ec3da14ad
tree9aa0b15668a5bffa1f05e766eebab1d3cbafb380
parent6d2c4619a59d53325e6de2265205c407767bde9d
parent2477ab2ea8651920a9909f6d05b15ad9004a6c64
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)
diff.c