1. 349362c xdiff: cast arguments for ctype functions to unsigned char by Jonathan Nieder · 14 years ago
  2. b4cf0f1 xdiff: optimise for no whitespace difference when ignoring whitespace. by Dylan Reid · 15 years ago
  3. c8c073c xdiff/xmerge.c: use memset() instead of explicit for-loop by Alexey Mahotkin · 15 years ago
  4. a4b5e91 xdl_merge(): move file1 and file2 labels to xmparam structure by Jonathan Nieder · 15 years ago
  5. 8a16143 xdl_merge(): add optional ancestor label to diff3-style output by Jonathan Nieder · 15 years ago
  6. 560119b refactor merge flags into xmparam_t by Bert Wesarg · 15 years ago
  7. cd1d61c make union merge an xdl merge favor by Bert Wesarg · 15 years ago
  8. 06dbc1e Merge branch 'jc/conflict-marker-size' by Junio C Hamano · 15 years ago
  9. 9914cf4 xdl_merge(): allow passing down marker_size in xmparam_t by Junio C Hamano · 15 years ago
  10. 00f8f97 xdl_merge(): introduce xmparam_t for merge specific parameters by Junio C Hamano · 15 years ago
  11. 73eb40e git-merge-file --ours, --theirs by Junio C Hamano · 17 years ago
  12. d34eca0 Merge branch 'tf/diff-whitespace-incomplete-line' by Junio C Hamano · 15 years ago
  13. 3b5ef0e xutils: Fix xdl_recmatch() on incomplete lines by Junio C Hamano · 16 years ago
  14. 78ed710 xutils: Fix hashing an incomplete line with whitespaces at the end by Junio C Hamano · 16 years ago
  15. f630cfd refactor: use bitsizeof() instead of 8 * sizeof() by Pierre Habouzit · 16 years ago
  16. 456cb4c Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint by Junio C Hamano · 16 years ago
  17. 5719db9 Change xdl_merge to generate output even for null merges by Charles Bailey · 16 years ago
  18. 3ea3c21 Fix typos / spelling in comments by Mike Ralphson · 16 years ago
  19. 8e24cba Fix various dead stores found by the clang static analyzer by Benjamin Kramer · 16 years ago
  20. 8c4c286 Merge branch 'kc/maint-diff-bwi-fix' into maint by Junio C Hamano · 16 years ago
  21. 5dc1308 Merge branch 'js/patience-diff' by Junio C Hamano · 16 years ago
  22. 9a01387 Merge branch 'kc/maint-diff-bwi-fix' by Junio C Hamano · 16 years ago
  23. 6d12ace Fix combined use of whitespace ignore options to diff by Keith Cascio · 16 years ago
  24. 92b7de9 Implement the patience diff algorithm by Johannes Schindelin · 16 years ago
  25. 6d0e674 diff: add option to show context between close hunks by René Scharfe · 16 years ago
  26. 733070b xdiff: give up scanning similar lines early by Davide Libenzi · 16 years ago
  27. ac2abb4 Merge branch 'dl/xdiff' by Junio C Hamano · 16 years ago
  28. 9b28d55 xdiff: give up scanning similar lines early by Davide Libenzi · 16 years ago
  29. ef2e62f Allow alternate "low-level" emit function from xdl_diff by Brian Downing · 16 years ago
  30. 8313374 xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less by Junio C Hamano · 17 years ago
  31. 838338c xmerge.c: minimum readability fixups by Junio C Hamano · 17 years ago
  32. e0af48e xdiff-merge: optionally show conflicts in "diff3 -m" style by Junio C Hamano · 17 years ago
  33. f2b25dd xdl_fill_merge_buffer(): separate out a too deeply nested function by Junio C Hamano · 17 years ago
  34. ee95ec5 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM by Johannes Schindelin · 17 years ago
  35. f407f14 xdl_merge(): make XDL_MERGE_ZEALOUS output simpler by Johannes Schindelin · 17 years ago
  36. a777e9c Remove unreachable statements by Guido Ostkamp · 17 years ago
  37. f258475 Per-path attribute based hunk header selection. by Junio C Hamano · 18 years ago
  38. 52fae7d Missing statics. by Pierre Habouzit · 18 years ago
  39. a6080a0 War on whitespace by Junio C Hamano · 18 years ago
  40. 824f782 xdiff/xutils.c(xdl_hash_record): factor out whitespace handling by Johannes Schindelin · 18 years ago
  41. 859f9c4 teach diff machinery about --ignore-space-at-eol by Johannes Schindelin · 18 years ago
  42. 22b6abc Fix yet another subtle xdl_merge() bug by Johannes Schindelin · 18 years ago
  43. 5d6b151 xdl_merge(): fix a segmentation fault when refining conflicts by Johannes Schindelin · 18 years ago
  44. 8042ed1 Merge branch 'master' into js/merge by Junio C Hamano · 18 years ago
  45. 98e6da8 xdl_merge(): fix and simplify conflict handling by Johannes Schindelin · 18 years ago
  46. c7c2488 diff -b: ignore whitespace at end of line by Johannes Schindelin · 18 years ago
  47. 710daa8 xdl_merge(): fix thinko by Johannes Schindelin · 18 years ago
  48. 875b8ce xdl_merge(): fix an off-by-one bug by Johannes Schindelin · 18 years ago
  49. 53a7085 xmerge: make return value from xdl_merge() more usable. by Junio C Hamano · 18 years ago
  50. 857b933 xdiff: add xdl_merge() by Johannes Schindelin · 18 years ago
  51. f73da29 Increase length of function name buffer by Andy Parkins · 18 years ago
  52. 70da769 xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines by Petr Baudis · 18 years ago
  53. 67aef03 xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header. by Jim Meyering · 18 years ago
  54. 3453f86 Merge branch 'maint' by Junio C Hamano · 18 years ago
  55. 9de0834 Fix hash function in xdiff library by Linus Torvalds · 18 years ago v1.4.2.4
  56. 2344d47 diff: fix 2 whitespace issues by Johannes Schindelin · 18 years ago
  57. 096b173 Merge branch 'lt/merge-tree' by Junio C Hamano · 19 years ago
  58. 82e5a82 Fix more typos, primarily in the code by Pavel Roskin · 19 years ago
  59. a9ed376 xdiff: generate "anti-diffs" aka what is common to two files by Linus Torvalds · 19 years ago
  60. 0d21efa Teach diff about -b and -w flags by Johannes Schindelin · 19 years ago
  61. d281786 xdiff: minor changes to match libxdiff-0.21 by Junio C Hamano · 19 years ago
  62. 295ba2f xdiff: post-process hunks to make them consistent. by Davide Libenzi · 19 years ago
  63. 0ed49a3 xdiff/xdiffi.c: fix warnings about possibly uninitialized variables by Marco Roeland · 19 years ago
  64. ca557af Clean-up trivially redundant diff. by Davide Libenzi · 19 years ago
  65. acb7257 xdiff: Show function names in hunk headers. by Mark Wooding · 19 years ago
  66. 3ce8f08 built-in diff: minimum tweaks by Junio C Hamano · 19 years ago
  67. 621c53c builtin-diff: \No newline at end of file. by Linus Torvalds · 19 years ago
  68. 3443546 Use a *real* built-in diff generator by Linus Torvalds · 19 years ago