Files

Documentation
block-sha1
builtin
compat
contrib
ewah
git-gui
gitk-git
gitweb
mergetools
- araxis
- bc
- bc3
- codecompare
- deltawalker
- diffmerge
- diffuse
- ecmerge
- emerge
- gvimdiff
- gvimdiff2
- gvimdiff3
- kdiff3
- kompare
- meld
- opendiff
- p4merge
- tkdiff
- tortoisemerge
- vimdiff
- vimdiff2
- vimdiff3
- winmerge
- xxdiff
perl
po
ppc
t
templates
vcs-svn
xdiff
.gitattributes
.gitignore
.mailmap
CONTRIBUTING.md
COPYING
GIT-VERSION-GEN
INSTALL
LGPL-2.1
Makefile
README
README.md
RelNotes
Vagrantfile
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alloc.c
archive-tar.c
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c
attr.h
base85.c
bisect.c
bisect.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h
check-builtins.sh
check-racy.c
check_bindir
color.c
color.h
column.c
column.h
combine-diff.c
command-list.txt
commit-slab.h
commit.c
commit.h
config.c
config.mak.in
config.mak.uname
configure.ac
connect.c
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
credential-cache--daemon.c
credential-cache.c
credential-store.c
credential.c
credential.h
csum-file.c
csum-file.h
ctype.c
daemon.c
date.c
decorate.c
decorate.h
delta.h
diff-delta.c
diff-lib.c
diff-no-index.c
diff.c
diff.h
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir.c
dir.h
editor.c
entry.c
environment.c
exec_cmd.c
exec_cmd.h
fast-import.c
fetch-pack.c
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
generate-cmdlist.perl
gettext.c
gettext.h
git-add--interactive.perl
git-am.sh
git-archimport.perl
git-bisect.sh
git-compat-util.h
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-difftool.perl
git-filter-branch.sh
git-instaweb.sh
git-merge-octopus.sh
git-merge-one-file.sh
git-merge-resolve.sh
git-mergetool--lib.sh
git-mergetool.sh
git-p4.py
git-parse-remote.sh
git-pull.sh
git-quiltimport.sh
git-rebase--am.sh
git-rebase--interactive.sh
git-rebase--merge.sh
git-rebase.sh
git-relink.perl
git-remote-testgit.sh
git-request-pull.sh
git-send-email.perl
git-sh-i18n.sh
git-sh-setup.sh
git-stash.sh
git-submodule.sh
git-svn.perl
git-web--browse.sh
git.c
git.rc
git.spec.in
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hashmap.c
hashmap.h
help.c
help.h
hex.c
http-backend.c
http-fetch.c
http-push.c
http-walker.c
http.c
http.h
ident.c
imap-send.c
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
line-log.c
line-log.h
line-range.c
line-range.h
list-objects.c
list-objects.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c
log-tree.h
mailmap.c
mailmap.h
match-trees.c
merge-blobs.c
merge-blobs.h
merge-recursive.c
merge-recursive.h
merge.c
mergesort.c
mergesort.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object.c
object.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
pager.c
parse-options-cb.c
parse-options.c
parse-options.h
patch-delta.c
patch-ids.c
patch-ids.h
path.c
pathspec.c
pathspec.h
pkt-line.c
pkt-line.h
preload-index.c
pretty.c
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
quote.c
quote.h
reachable.c
reachable.h
read-cache.c
reflog-walk.c
reflog-walk.h
refs.c
refs.h
remote-curl.c
remote-testsvn.c
remote.c
remote.h
replace_object.c
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c
revision.h
run-command.c
run-command.h
send-pack.c
send-pack.h
sequencer.c
sequencer.h
server-info.c
setup.c
sh-i18n--envsubst.c
sha1-array.c
sha1-array.h
sha1-lookup.c
sha1-lookup.h
sha1_file.c
sha1_name.c
shallow.c
shell.c
shortlog.h
show-index.c
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c
split-index.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
submodule.c
submodule.h
symlinks.c
tag.c
tag.h
tar.h
test-chmtime.c
test-config.c
test-ctype.c
test-date.c
test-delta.c
test-dump-cache-tree.c
test-dump-split-index.c
test-dump-untracked-cache.c
test-genrandom.c
test-hashmap.c
test-index-version.c
test-line-buffer.c
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-parse-options.c
test-path-utils.c
test-prio-queue.c
test-read-cache.c
test-regex.c
test-revision-walking.c
test-run-command.c
test-scrap-cache-tree.c
test-sha1-array.c
test-sha1.c
test-sha1.sh
test-sigchain.c
test-string-list.c
test-subprocess.c
test-svn-fe.c
test-urlmatch-normalization.c
test-wildmatch.c
thread-utils.c
thread-utils.h
trace.c
trace.h
trailer.c
trailer.h
transport-helper.c
transport.c
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode_width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c
unpack-trees.h
update_unicode.sh
upload-pack.c
url.c
url.h
urlmatch.c
urlmatch.h
usage.c
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
wrap-for-bin.sh
wrapper.c
write_or_die.c
ws.c
wt-status.c
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

mergetools

davvid

and

gitster

mergetools: add winmerge as a builtin tool

May 20, 2015

3e4f237 · May 20, 2015

History

This branch is 112770 commits behind git-for-windows/git:main.

Name	Name	Last commit message	Last commit date
parent directory ..
araxis	araxis	mergetool--lib: Refactor tools into separate files	Aug 19, 2011
bc	bc	mergetool: rename bc3 to bc	Oct 21, 2014
bc3	bc3	mergetool: rename bc3 to bc	Oct 21, 2014
codecompare	codecompare	Add Code Compare v2.80.4 as a merge / diff tool for Windows	Aug 10, 2012
deltawalker	deltawalker	mergetools: add a plug-in to support DeltaWalker	Mar 5, 2012
diffmerge	diffmerge	mergetools: stop setting $status in merge_cmd()	Nov 21, 2014
diffuse	diffuse	mergetool--lib: Refactor tools into separate files	Aug 19, 2011
ecmerge	ecmerge	mergetool--lib: Refactor tools into separate files	Aug 19, 2011
emerge	emerge	mergetools: stop setting $status in merge_cmd()	Nov 21, 2014
gvimdiff	gvimdiff	mergetools: simplify how we handle "vim" and "defaults"	Jan 29, 2013
gvimdiff2	gvimdiff2	mergetools: simplify how we handle "vim" and "defaults"	Jan 29, 2013
gvimdiff3	gvimdiff3	mergetools: add vimdiff3 mode	Apr 22, 2014
kdiff3	kdiff3	mergetools: stop setting $status in merge_cmd()	Nov 21, 2014
kompare	kompare	mergetool--lib: Refactor tools into separate files	Aug 19, 2011
meld	meld	mergetools/meld: make usage of `--output` configurable and more robust	Oct 16, 2014
opendiff	opendiff	mergetool--lib: Refactor tools into separate files	Aug 19, 2011
p4merge	p4merge	mergetools/p4merge: create a base if none available	Mar 13, 2013
tkdiff	tkdiff	mergetool--lib: Refactor tools into separate files	Aug 19, 2011
tortoisemerge	tortoisemerge	mergetools: teach tortoisemerge to handle filenames with SP correctly	Feb 2, 2013
vimdiff	vimdiff	mergetools: add vimdiff3 mode	Apr 22, 2014
vimdiff2	vimdiff2	mergetools: simplify how we handle "vim" and "defaults"	Jan 29, 2013
vimdiff3	vimdiff3	mergetools: add vimdiff3 mode	Apr 22, 2014
winmerge	winmerge	mergetools: add winmerge as a builtin tool	May 20, 2015
xxdiff	xxdiff	mergetool--lib: Refactor tools into separate files	Aug 19, 2011

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Files

mergetools

mergetools

Files

mergetools

Directory actions

More options

Directory actions

More options

Latest commit

History

mergetools

Folders and files

parent directory