aboutsummaryrefslogtreecommitdiff
path: root/mergetools
Commit message (Expand)AuthorAge
* mergetools: stop setting $status in merge_cmd()David Aguilar2014-11-21
* Merge branch 'oc/mergetools-beyondcompare'Junio C Hamano2014-10-29
|\
| * mergetool: rename bc3 to bcJunio C Hamano2014-10-21
* | mergetools/meld: make usage of `--output` configurable and more robustDavid Aguilar2014-10-16
|/
* mergetools: add vimdiff3 modeFelipe Contreras2014-04-22
* mergetools/diffmerge: support DiffMerge as a git mergetoolStefan Saasen2013-10-13
* Sync with v1.8.2.3Junio C Hamano2013-05-09
|\
| * mergetools/kdiff3: do not use --auto when diffingDavid Aguilar2013-05-09
* | mergetools/p4merge: create a base if none availableKevin Bracey2013-03-13
* | mergetools/p4merge: swap LOCAL and REMOTEKevin Bracey2013-03-13
|/
* Merge branch 'da/p4merge-mktemp-fix'Junio C Hamano2013-02-14
|\
| * p4merge: fix printf usageDavid Aguilar2013-02-10
* | Merge branch 'ss/mergetools-tortoise'Junio C Hamano2013-02-07
|\ \
| * | mergetools: teach tortoisemerge to handle filenames with SP correctlySven Strickroth2013-02-01
| * | mergetools: support TortoiseGitMergeSven Strickroth2013-01-26
* | | Merge branch 'jk/mergetool'Junio C Hamano2013-02-07
|\ \ \ | |_|/ |/| |
| * | mergetools: simplify how we handle "vim" and "defaults"David Aguilar2013-01-28
| * | mergetools/vim: remove redundant diff commandDavid Aguilar2013-01-27
* | | mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholderDavid Aguilar2012-12-26
| |/ |/|
* | Merge branch 'da/mergetools-p4'Jeff King2012-10-25
|\ \ | |/ |/|
| * mergetools/p4merge: Handle "/dev/null"David Aguilar2012-10-11
* | Merge branch 'da/mergetool-custom'Junio C Hamano2012-10-01
|\ \
| * | mergetool--lib: Allow custom commands to override built-insDavid Aguilar2012-09-25
| |/
* | Add Code Compare v2.80.4 as a merge / diff tool for WindowsSebastian Schuberth2012-08-10
|/
* mergetools: add a plug-in to support DeltaWalkerTim Henigan2012-03-05
* Merge branch 'jn/ancient-meld-support'Junio C Hamano2012-02-14
|\
| * mergetools/meld: Use --help output to detect --output supportJonathan Nieder2012-02-10
* | mergetools: use the correct tool for Beyond Compare 3 on WindowsPat Thoyts2011-10-15
|/
* mergetools/meld: Use '--output' when availableDavid Aguilar2011-08-19
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-19