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