Google Git
Sign in
googlers / jrn / git / a1155adc2dde23fd664ad47399379cd0561762af / git-mergetool--lib.sh
  1. af31471 mergetool: Remove explicit references to /dev/tty by Charles Bailey · 15 years ago
  2. 02e5124 add shebang line to git-mergetool--lib.sh by Jeff King · 15 years ago
  3. ad7ace7 Merge branch 'rs/work-around-grep-opt-insanity' by Junio C Hamano · 15 years ago
  4. 7b10422 mergetool--lib: simplify guess_merge_tool() by René Scharfe · 15 years ago
  5. c8998b4 mergetool--lib: add p4merge as a pre-configured mergetool option by Scott Chacon · 15 years ago
  6. b6f0621 mergetool--lib: add support for araxis merge by David Aguilar · 16 years ago
  7. 4481ff0 mergetool--lib: specialize diff options for emerge and ecmerge by David Aguilar · 16 years ago
  8. 47d6592 mergetool--lib: simplify API usage by removing more global variables by David Aguilar · 16 years ago
  9. 21d0ba7 difftool/mergetool: refactor commands to use git-mergetool--lib by David Aguilar · 16 years ago