Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
mergetools
Age
Commit message (
Expand
)
Author
2020-07-30
mergetool--lib: improve support for vimdiff-style tool variants
pudinha
2019-04-04
mergetools: add support for smerge (Sublime Merge)
David Aguilar
2018-04-06
mergetools: add support for guiffy
Bill Ritcher
2017-06-19
mergetools/meld: improve compatibiilty with Meld on macOS X
David Aguilar
2016-12-20
Merge branch 'da/mergetool-xxdiff-hotkey'
Junio C Hamano
2016-12-12
mergetools: fix xxdiff hotkeys
David Aguilar
2016-11-29
mergetools/vimdiff: trust Vim's exit code
David Aguilar
2016-11-29
mergetool: honor mergetool.$tool.trustExitCode for built-in tools
David Aguilar
2016-04-04
mergetools: add support for ExamDiff
Jacob Nisnevich
2016-04-04
mergetools: create mergetool_find_win32_cmd() helper function for winmerge
Jacob Nisnevich
2016-02-12
mergetool: reorder vim/gvim buffers in three-way diffs
Dickson Wong
2015-05-20
mergetools: add winmerge as a builtin tool
David Aguilar
2014-11-21
mergetools: stop setting $status in merge_cmd()
David Aguilar
2014-10-29
Merge branch 'oc/mergetools-beyondcompare'
Junio C Hamano
2014-10-21
mergetool: rename bc3 to bc
Junio C Hamano
2014-10-16
mergetools/meld: make usage of `--output` configurable and more robust
David Aguilar
2014-04-22
mergetools: add vimdiff3 mode
Felipe Contreras
2013-10-14
mergetools/diffmerge: support DiffMerge as a git mergetool
Stefan Saasen
2013-05-10
Sync with v1.8.2.3
Junio C Hamano
2013-05-09
mergetools/kdiff3: do not use --auto when diffing
David Aguilar
2013-03-13
mergetools/p4merge: create a base if none available
Kevin Bracey
2013-03-13
mergetools/p4merge: swap LOCAL and REMOTE
Kevin Bracey
2013-02-15
Merge branch 'da/p4merge-mktemp-fix'
Junio C Hamano
2013-02-10
p4merge: fix printf usage
David Aguilar
2013-02-08
Merge branch 'ss/mergetools-tortoise'
Junio C Hamano
2013-02-08
Merge branch 'jk/mergetool'
Junio C Hamano
2013-02-02
mergetools: teach tortoisemerge to handle filenames with SP correctly
Sven Strickroth
2013-01-29
mergetools: simplify how we handle "vim" and "defaults"
David Aguilar
2013-01-28
mergetools/vim: remove redundant diff command
David Aguilar
2013-01-27
mergetools: support TortoiseGitMerge
Sven Strickroth
2012-12-27
mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
David Aguilar
2012-10-25
Merge branch 'da/mergetools-p4'
Jeff King
2012-10-11
mergetools/p4merge: Handle "/dev/null"
David Aguilar
2012-10-01
Merge branch 'da/mergetool-custom'
Junio C Hamano
2012-09-25
mergetool--lib: Allow custom commands to override built-ins
David Aguilar
2012-08-10
Add Code Compare v2.80.4 as a merge / diff tool for Windows
Sebastian Schuberth
2012-03-05
mergetools: add a plug-in to support DeltaWalker
Tim Henigan
2012-02-15
Merge branch 'jn/ancient-meld-support'
Junio C Hamano
2012-02-11
mergetools/meld: Use --help output to detect --output support
Jonathan Nieder
2011-10-16
mergetools: use the correct tool for Beyond Compare 3 on Windows
Pat Thoyts
2011-08-19
mergetools/meld: Use '--output' when available
David Aguilar
2011-08-19
mergetool--lib: Refactor tools into separate files
David Aguilar