projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9eefd8a 307ab20)
Merge branch 'jc/diff-algo-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 05:51:14 +0000 (22:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Apr 2012 05:51:15 +0000 (22:51 -0700)
commit86c340e08287c0faad8871207787e5819f22a7d5
treeee05a1f8d8fdf038e385de68ecc107793c123eb5tree | snapshot
parent9eefd8ae8a955f470d931c13b8711d98f4e9d56ecommit | diff
parent307ab20b333d9b4c818b1ff912e86944d1a3fdc1commit | diff
Merge branch 'jc/diff-algo-cleanup'

Resurrects the preparatory clean-up patches from another topic that was
discarded, as this would give a saner foundation to build on diff.algo
configuration option series.

* jc/diff-algo-cleanup:
  xdiff: PATIENCE/HISTOGRAM are not independent option bits
  xdiff: remove XDL_PATCH_* macros
diff.c diff1 | diff2 | blob | history
diff.h diff1 | diff2 | blob | history
merge-recursive.c diff1 | diff2 | blob | history
Git—the stupid content tracker