Alexander Gavrilov 48c74a58b1 git-gui: Support more merge tools. ... Add native support for Araxis Merge, WinMerge and Perforce merge. Custom merge tools are not implemented by mergetool.tcl; besides, native support allows constructing the command lines in a more intelligent way. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>		2008-09-04 21:28:55 -07:00
..
about.tcl
blame.tcl	git-gui: Allow specifying an initial line for git gui blame.	2008-08-24 22:00:01 -07:00
branch_checkout.tcl
branch_create.tcl	git-gui: Setup branch.remote,merge for shorthand git-pull	2008-05-08 20:20:27 -04:00
branch_delete.tcl	git-gui: Delete branches with 'git branch -D' to clear config	2008-05-08 20:29:42 -04:00
branch_rename.tcl
branch.tcl
browser.tcl	git-gui: Allow specifying an initial line for git gui blame.	2008-08-24 22:00:01 -07:00
checkout_op.tcl	git-gui: Setup branch.remote,merge for shorthand git-pull	2008-05-08 20:20:27 -04:00
choose_font.tcl
choose_repository.tcl	git-gui: Vertically align textboxes with labels	2008-05-26 21:05:20 -04:00
choose_rev.tcl
class.tcl
commit.tcl	git-gui: Teach git gui about file type changes	2008-08-24 21:36:17 -07:00
console.tcl
database.tcl	git-gui: Report less precise object estimates for database compression	2008-04-14 19:34:23 -04:00
date.tcl
diff.tcl	git gui: show diffs with a minimum of 1 context line	2008-09-01 12:45:46 -07:00
encoding.tcl
error.tcl
git-gui.ico
index.tcl	git-gui: Mark forgotten strings for translation.	2008-09-04 21:28:48 -07:00
logo.tcl
merge.tcl	git-gui: MERGE_RR lives in .git/ directly with newer Git versions	2008-07-13 17:58:40 -04:00
mergetool.tcl	git-gui: Support more merge tools.	2008-09-04 21:28:55 -07:00
option.tcl	git-gui: Support calling merge tools.	2008-09-04 21:28:54 -07:00
remote_branch_delete.tcl
remote.tcl
shortcut.tcl
spellcheck.tcl	git-gui: Don't use '$$cr master' with aspell earlier than 0.60	2008-04-23 21:34:58 -04:00
status_bar.tcl
transport.tcl
win32_shortcut.js
win32.tcl