git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0941d60 81b568c)
Merge branch 'rs/diff-cleanup-records-fix'
authorJunio C Hamano <redacted>
Fri, 14 Oct 2011 02:03:22 +0000 (19:03 -0700)
committerJunio C Hamano <redacted>
Fri, 14 Oct 2011 02:03:22 +0000 (19:03 -0700)
* rs/diff-cleanup-records-fix:
  diff: resurrect XDF_NEED_MINIMAL with --minimal
  Revert removal of multi-match discard heuristic in 27af01

1  2 
diff.c patch | diff1 | diff2 | blob | history
xdiff/xprepare.c patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
diff --cc xdiff/xprepare.c
Simple merge
git clone https://git.99rst.org/PROJECT