summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
AgeCommit message (Expand)AuthorFilesLines
2011-05-01Pass empty file to p4merge where no base is suitable.Libravatar Ciaran Jessup1-6/+3
2011-03-19Merge branch 'ss/mergetool--lib'Libravatar Junio C Hamano1-104/+121
2011-02-28mergetool--lib: Add Beyond Compare 3 as a toolLibravatar Sebastian Schuberth1-2/+20
2011-02-28mergetool--lib: Sort tools alphabetically for easier lookupLibravatar Sebastian Schuberth1-110/+109
2011-02-25mergetool-lib: call vim in readonly mode for diffsLibravatar Michael J Gruber1-2/+2
2010-09-29mergetool-lib: make the three-way diff the default for vim/gvimLibravatar Dan McGee1-3/+15
2010-09-15mergetool-lib: add a three-way diff view for vim/gvimLibravatar Dan McGee1-2/+7
2010-09-15mergetool-lib: combine vimdiff and gvimdiff run blocksLibravatar Dan McGee1-14/+3
2010-08-20mergetool: Remove explicit references to /dev/ttyLibravatar Charles Bailey1-1/+1
2010-01-29add shebang line to git-mergetool--lib.shLibravatar Jeff King1-0/+1
2009-11-25Merge branch 'rs/work-around-grep-opt-insanity'Libravatar Junio C Hamano1-7/+6
2009-11-23mergetool--lib: simplify guess_merge_tool()Libravatar René Scharfe1-7/+6
2009-10-28mergetool--lib: add p4merge as a pre-configured mergetool optionLibravatar Scott Chacon1-2/+15
2009-05-24mergetool--lib: add support for araxis mergeLibravatar David Aguilar1-2/+23
2009-05-09mergetool--lib: specialize diff options for emerge and ecmergeLibravatar David Aguilar1-3/+3
2009-04-12mergetool--lib: simplify API usage by removing more global variablesLibravatar David Aguilar1-51/+58
2009-04-08difftool/mergetool: refactor commands to use git-mergetool--libLibravatar David Aguilar1-0/+378
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 04:58:20 +0000