Google Git
Sign in
googlers / jrn / git / 61eea521fef11c6878a4157bcc0fca6e981a58b2 / xdiff / xmerge.c
  1. 4842579 Replace Free Software Foundation address in license notices by Todd Zullinger · 7 years ago
  2. c1fa85f Merge branch 'ps/plug-xdl-merge-leak' by Junio C Hamano · 9 years ago
  3. 4867f11 xdiff/xmerge: fix memory leak in xdl_merge by Patrick Steinhardt · 9 years ago
  4. 15980de merge-file: ensure that conflict sections match eol style by Johannes Schindelin · 9 years ago
  5. 86efa21 merge-file: let conflict markers match end-of-line style of the context by Johannes Schindelin · 9 years ago
  6. ba31180 git-merge-file: do not add LF at EOF while applying unrelated change by Max Kirillov · 11 years ago
  7. 349362c xdiff: cast arguments for ctype functions to unsigned char by Jonathan Nieder · 14 years ago
  8. c8c073c xdiff/xmerge.c: use memset() instead of explicit for-loop by Alexey Mahotkin · 15 years ago
  9. a4b5e91 xdl_merge(): move file1 and file2 labels to xmparam structure by Jonathan Nieder · 15 years ago
  10. 8a16143 xdl_merge(): add optional ancestor label to diff3-style output by Jonathan Nieder · 15 years ago
  11. 560119b refactor merge flags into xmparam_t by Bert Wesarg · 15 years ago
  12. cd1d61c make union merge an xdl merge favor by Bert Wesarg · 15 years ago
  13. 06dbc1e Merge branch 'jc/conflict-marker-size' by Junio C Hamano · 15 years ago
  14. 9914cf4 xdl_merge(): allow passing down marker_size in xmparam_t by Junio C Hamano · 15 years ago
  15. 00f8f97 xdl_merge(): introduce xmparam_t for merge specific parameters by Junio C Hamano · 15 years ago
  16. 73eb40e git-merge-file --ours, --theirs by Junio C Hamano · 17 years ago
  17. 456cb4c Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint by Junio C Hamano · 16 years ago
  18. 5719db9 Change xdl_merge to generate output even for null merges by Charles Bailey · 16 years ago
  19. 8313374 xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less by Junio C Hamano · 17 years ago
  20. 838338c xmerge.c: minimum readability fixups by Junio C Hamano · 17 years ago
  21. e0af48e xdiff-merge: optionally show conflicts in "diff3 -m" style by Junio C Hamano · 17 years ago
  22. f2b25dd xdl_fill_merge_buffer(): separate out a too deeply nested function by Junio C Hamano · 17 years ago
  23. ee95ec5 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM by Johannes Schindelin · 17 years ago
  24. f407f14 xdl_merge(): make XDL_MERGE_ZEALOUS output simpler by Johannes Schindelin · 17 years ago
  25. 22b6abc Fix yet another subtle xdl_merge() bug by Johannes Schindelin · 18 years ago
  26. 5d6b151 xdl_merge(): fix a segmentation fault when refining conflicts by Johannes Schindelin · 18 years ago
  27. 98e6da8 xdl_merge(): fix and simplify conflict handling by Johannes Schindelin · 18 years ago
  28. 710daa8 xdl_merge(): fix thinko by Johannes Schindelin · 18 years ago
  29. 875b8ce xdl_merge(): fix an off-by-one bug by Johannes Schindelin · 18 years ago
  30. 53a7085 xmerge: make return value from xdl_merge() more usable. by Junio C Hamano · 18 years ago
  31. 857b933 xdiff: add xdl_merge() by Johannes Schindelin · 18 years ago