Google Git
Sign in
googlers / jrn / git / d95f91d9e48a88a39ac2de5bfddd9d33fd36435d / xdiff
  1. 8313374 xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less by Junio C Hamano · 17 years ago
  2. 838338c xmerge.c: minimum readability fixups by Junio C Hamano · 17 years ago
  3. e0af48e xdiff-merge: optionally show conflicts in "diff3 -m" style by Junio C Hamano · 17 years ago
  4. f2b25dd xdl_fill_merge_buffer(): separate out a too deeply nested function by Junio C Hamano · 17 years ago
  5. ee95ec5 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM by Johannes Schindelin · 17 years ago
  6. f407f14 xdl_merge(): make XDL_MERGE_ZEALOUS output simpler by Johannes Schindelin · 17 years ago
  7. a777e9c Remove unreachable statements by Guido Ostkamp · 17 years ago
  8. f258475 Per-path attribute based hunk header selection. by Junio C Hamano · 18 years ago
  9. 52fae7d Missing statics. by Pierre Habouzit · 18 years ago
  10. a6080a0 War on whitespace by Junio C Hamano · 18 years ago
  11. 824f782 xdiff/xutils.c(xdl_hash_record): factor out whitespace handling by Johannes Schindelin · 18 years ago
  12. 859f9c4 teach diff machinery about --ignore-space-at-eol by Johannes Schindelin · 18 years ago
  13. 22b6abc Fix yet another subtle xdl_merge() bug by Johannes Schindelin · 18 years ago
  14. 5d6b151 xdl_merge(): fix a segmentation fault when refining conflicts by Johannes Schindelin · 18 years ago
  15. 8042ed1 Merge branch 'master' into js/merge by Junio C Hamano · 18 years ago
  16. 98e6da8 xdl_merge(): fix and simplify conflict handling by Johannes Schindelin · 18 years ago
  17. c7c2488 diff -b: ignore whitespace at end of line by Johannes Schindelin · 18 years ago
  18. 710daa8 xdl_merge(): fix thinko by Johannes Schindelin · 18 years ago
  19. 875b8ce xdl_merge(): fix an off-by-one bug by Johannes Schindelin · 18 years ago
  20. 53a7085 xmerge: make return value from xdl_merge() more usable. by Junio C Hamano · 18 years ago
  21. 857b933 xdiff: add xdl_merge() by Johannes Schindelin · 18 years ago
  22. f73da29 Increase length of function name buffer by Andy Parkins · 18 years ago
  23. 70da769 xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines by Petr Baudis · 18 years ago
  24. 67aef03 xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header. by Jim Meyering · 18 years ago
  25. 3453f86 Merge branch 'maint' by Junio C Hamano · 18 years ago
  26. 9de0834 Fix hash function in xdiff library by Linus Torvalds · 18 years ago v1.4.2.4
  27. 2344d47 diff: fix 2 whitespace issues by Johannes Schindelin · 18 years ago
  28. 096b173 Merge branch 'lt/merge-tree' by Junio C Hamano · 19 years ago
  29. 82e5a82 Fix more typos, primarily in the code by Pavel Roskin · 19 years ago
  30. a9ed376 xdiff: generate "anti-diffs" aka what is common to two files by Linus Torvalds · 19 years ago
  31. 0d21efa Teach diff about -b and -w flags by Johannes Schindelin · 19 years ago
  32. d281786 xdiff: minor changes to match libxdiff-0.21 by Junio C Hamano · 19 years ago
  33. 295ba2f xdiff: post-process hunks to make them consistent. by Davide Libenzi · 19 years ago
  34. 0ed49a3 xdiff/xdiffi.c: fix warnings about possibly uninitialized variables by Marco Roeland · 19 years ago
  35. ca557af Clean-up trivially redundant diff. by Davide Libenzi · 19 years ago
  36. acb7257 xdiff: Show function names in hunk headers. by Mark Wooding · 19 years ago
  37. 3ce8f08 built-in diff: minimum tweaks by Junio C Hamano · 19 years ago
  38. 621c53c builtin-diff: \No newline at end of file. by Linus Torvalds · 19 years ago
  39. 3443546 Use a *real* built-in diff generator by Linus Torvalds · 19 years ago