Google Git
Sign in
googlers / jrn / git / 785a04298177e155dc7391e7234945b38b624e34 / t / t6023-merge-file.sh
  1. b5967f8 tests: cleanup binary test vector files by Vitaliy Ivanov · 14 years ago
  2. 55846b9 merge-file: correctly find files when called in subdir by Thomas Rast · 14 years ago
  3. 4bb0936 merge-file --diff3: add a label for ancestor by Jonathan Nieder · 15 years ago
  4. 2bb76e1 Merge branch 'bw/union-merge-refactor' by Junio C Hamano · 15 years ago
  5. 11f3aa2 merge-file: add option to specify the marker size by Bert Wesarg · 15 years ago
  6. 3fdcdbd Windows: redirect f[re]open("/dev/null") to f[re]open("nul") by Johannes Sixt · 15 years ago
  7. 9524cf2 fix portability issues with $ in double quotes by Stephen Boyd · 15 years ago
  8. 456cb4c Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint by Junio C Hamano · 16 years ago
  9. 5719db9 Change xdl_merge to generate output even for null merges by Charles Bailey · 16 years ago
  10. 1cd1292 t6023: merge-file fails to output anything for a degenerate merge by Charles Bailey · 16 years ago
  11. 9ba929e Merge branch 'jc/better-conflict-resolution' by Shawn O. Pearce · 16 years ago
  12. 10708a9 t6023-merge-file: Work around non-portable sed usage by Arjen Laarhoven · 17 years ago
  13. b541248 merge.conflictstyle: choose between "merge" and "diff3 -m" styles by Junio C Hamano · 17 years ago
  14. e0af48e xdiff-merge: optionally show conflicts in "diff3 -m" style by Junio C Hamano · 17 years ago
  15. bfdbee9 tests: use $TEST_DIRECTORY to refer to the t/ directory by Junio C Hamano · 17 years ago
  16. d492b31 t/: Use "test_must_fail git" instead of "! git" by Stephan Beyer · 17 years ago
  17. 3af8286 tests: do not use implicit "git diff --no-index" by Junio C Hamano · 17 years ago
  18. ee95ec5 xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM by Johannes Schindelin · 17 years ago
  19. f407f14 xdl_merge(): make XDL_MERGE_ZEALOUS output simpler by Johannes Schindelin · 17 years ago
  20. 41ac414 Sane use of test_expect_failure by Junio C Hamano · 17 years ago
  21. 5be6007 Rewrite "git-frotz" to "git frotz" by Junio C Hamano · 18 years ago
  22. 89dd19e Merge branch 'js/merge' by Junio C Hamano · 18 years ago
  23. a6080a0 War on whitespace by Junio C Hamano · 18 years ago
  24. 5771907 git-merge-file: refuse to merge binary files by Johannes Schindelin · 18 years ago
  25. 4848509 Fix permissions on test scripts by Alex Riesen · 18 years ago
  26. 5bd7450 Get rid of the dependency to GNU diff in the tests by Johannes Schindelin · 18 years ago
  27. 2aad957 Replace "echo -n" with printf in shell scripts. by Jason Riedy · 18 years ago
  28. 5d6b151 xdl_merge(): fix a segmentation fault when refining conflicts by Johannes Schindelin · 18 years ago
  29. ba1f5f3 Add builtin merge-file, a minimal replacement for RCS merge by Johannes Schindelin · 18 years ago