summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
Commit message (Expand)AuthorAgeFilesLines
* mergetool: support --tool-help option like difftool doesJunio C Hamano2012-07-231-1/+5
* Merge branch 'maint'Junio C Hamano2011-09-191-1/+1
|\
| * git-mergetool: check return value from readJay Soffian2011-09-191-1/+1
* | mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-191-333/+52
* | mergetool--lib: Make style consistent with gitDavid Aguilar2011-08-191-53/+100
* | misc-sh: fix up whitespace in some other .sh files.Jon Seymour2011-08-051-3/+3
* | Merge branch 'da/git-prefix-everywhere' into nextJunio C Hamano2011-06-291-0/+7
|\ \ | |/ |/|
| * git-mergetool--lib: Make vimdiff retain the current directoryDavid Aguilar2011-05-261-0/+7
* | Pass empty file to p4merge where no base is suitable.Ciaran Jessup2011-05-011-6/+3
|/
* Merge branch 'ss/mergetool--lib'Junio C Hamano2011-03-191-104/+121
|\
| * mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-281-2/+20
| * mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth2011-02-281-110/+109
* | mergetool-lib: call vim in readonly mode for diffsMichael J Gruber2011-02-251-2/+2
|/
* mergetool-lib: make the three-way diff the default for vim/gvimDan McGee2010-09-291-3/+15
* mergetool-lib: add a three-way diff view for vim/gvimDan McGee2010-09-151-2/+7
* mergetool-lib: combine vimdiff and gvimdiff run blocksDan McGee2010-09-151-14/+3
* mergetool: Remove explicit references to /dev/ttyCharles Bailey2010-08-201-1/+1
* add shebang line to git-mergetool--lib.shJeff King2010-01-291-0/+1
* Merge branch 'rs/work-around-grep-opt-insanity'Junio C Hamano2009-11-251-7/+6
|\
| * mergetool--lib: simplify guess_merge_tool()René Scharfe2009-11-231-7/+6
* | mergetool--lib: add p4merge as a pre-configured mergetool optionScott Chacon2009-10-281-2/+15
|/
* mergetool--lib: add support for araxis mergeDavid Aguilar2009-05-241-2/+23
* mergetool--lib: specialize diff options for emerge and ecmergeDavid Aguilar2009-05-091-3/+3
* mergetool--lib: simplify API usage by removing more global variablesDavid Aguilar2009-04-121-51/+58
* difftool/mergetool: refactor commands to use git-mergetool--libDavid Aguilar2009-04-081-0/+378