Google Git
Sign in
googlers / jrn / git / e1ebf212377837d676b0b28a821c022b0a3e57f3 / mergetools
  1. eeaf4e7 Merge branch 'ss/mergetools-tortoise' by Junio C Hamano · 12 years ago
  2. 55f56fe Merge branch 'jk/mergetool' by Junio C Hamano · 12 years ago
  3. 81ed7b9 mergetools: teach tortoisemerge to handle filenames with SP correctly by Sven Strickroth · 12 years ago
  4. 073678b mergetools: simplify how we handle "vim" and "defaults" by David Aguilar · 12 years ago
  5. b2a6b71 mergetools/vim: remove redundant diff command by David Aguilar · 12 years ago
  6. 8bf6719 mergetools: support TortoiseGitMerge by Sven Strickroth · 12 years ago
  7. 950b568 mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder by David Aguilar · 12 years ago
  8. 33d3c6b Merge branch 'da/mergetools-p4' by Jeff King · 12 years ago
  9. 3facc60 mergetools/p4merge: Handle "/dev/null" by David Aguilar · 12 years ago
  10. 5ec11ab Merge branch 'da/mergetool-custom' by Junio C Hamano · 12 years ago
  11. a427ef7 mergetool--lib: Allow custom commands to override built-ins by David Aguilar · 12 years ago
  12. 755e8b3 Add Code Compare v2.80.4 as a merge / diff tool for Windows by Sebastian Schuberth · 13 years ago
  13. 284a126 mergetools: add a plug-in to support DeltaWalker by Tim Henigan · 13 years ago
  14. 746b6fb Merge branch 'jn/ancient-meld-support' by Junio C Hamano · 13 years ago
  15. 759a904 mergetools/meld: Use --help output to detect --output support by Jonathan Nieder · 13 years ago
  16. 8850c3d mergetools: use the correct tool for Beyond Compare 3 on Windows by Pat Thoyts · 13 years ago
  17. f61bd9c mergetools/meld: Use '--output' when available by David Aguilar · 14 years ago
  18. bc7a96a mergetool--lib: Refactor tools into separate files by David Aguilar · 14 years ago