path: root/
AgeCommit message (Expand)Author
2011-09-20Merge branch 'maint'Junio C Hamano
2011-09-20git-mergetool: check return value from readJay Soffian
2011-08-19mergetool--lib: Refactor tools into separate filesDavid Aguilar
2011-08-19mergetool--lib: Make style consistent with gitDavid Aguilar
2011-08-05misc-sh: fix up whitespace in some other .sh files.Jon Seymour
2011-06-30Merge branch 'da/git-prefix-everywhere' into nextJunio C Hamano
2011-05-26git-mergetool--lib: Make vimdiff retain the current directoryDavid Aguilar
2011-05-01Pass empty file to p4merge where no base is suitable.Ciaran Jessup
2011-03-20Merge branch 'ss/mergetool--lib'Junio C Hamano
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth
2011-02-28mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth
2011-02-25mergetool-lib: call vim in readonly mode for diffsMichael J Gruber
2010-09-29mergetool-lib: make the three-way diff the default for vim/gvimDan McGee
2010-09-15mergetool-lib: add a three-way diff view for vim/gvimDan McGee
2010-09-15mergetool-lib: combine vimdiff and gvimdiff run blocksDan McGee
2010-08-20mergetool: Remove explicit references to /dev/ttyCharles Bailey
2010-01-29add shebang line to git-mergetool--lib.shJeff King
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano
2009-11-23mergetool--lib: simplify guess_merge_tool()René Scharfe
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon
2009-05-24mergetool--lib: add support for araxis mergeDavid Aguilar
2009-05-09mergetool--lib: specialize diff options for emerge and ecmergeDavid Aguilar
2009-04-12mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar