Bert Wesarg b436825b9b git-gui: support for diff3 conflict style ...

This adds highlight support for the diff3 conflict style.

The common pre-image will be reversed to --, because it has been removed
and replaced with ours or theirs side respectively.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>

2019-10-04 03:26:15 +05:30

..

about.tcl

git-gui: use themed tk widgets with Tk 8.5

2010-01-27 17:13:52 -08:00

blame.tcl

git-gui: fix incorrect use of Tcl append command

2016-10-03 23:40:10 +01:00

branch_checkout.tcl

git-gui: fix incorrect use of Tcl append command

2016-10-03 23:40:10 +01:00

branch_create.tcl

git-gui: fix incorrect use of Tcl append command

2016-10-03 23:40:10 +01:00

branch_delete.tcl

git-gui: fix incorrect use of Tcl append command

2016-10-03 23:40:10 +01:00

branch_rename.tcl

git-gui: fix incorrect use of Tcl append command

2016-10-03 23:40:10 +01:00

branch.tcl

git-gui: Always use absolute path to all git executables

2007-07-09 01:17:09 -04:00

browser.tcl

git-gui: unicode file name support on windows

2016-10-06 09:21:50 +01:00

checkout_op.tcl

git-gui: convert new/amend commit radiobutton to checkbutton

2019-09-14 00:37:47 +05:30

choose_font.tcl

git-gui: use themed tk widgets with Tk 8.5

2010-01-27 17:13:52 -08:00

choose_repository.tcl

git gui: allow for a long recentrepo list

2017-01-20 21:11:18 +00:00

choose_rev.tcl

git-gui: set suitable extended window manager hints.

2011-10-19 14:26:29 +01:00

class.tcl

git-gui: set suitable extended window manager hints.

2011-10-19 14:26:29 +01:00

commit.tcl

Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff

2019-09-24 19:47:43 +05:30

console.tcl

git-gui: use themed tk widgets with Tk 8.5

2010-01-27 17:13:52 -08:00

database.tcl

git-gui: fix incorrect use of Tcl append command

2016-10-03 23:40:10 +01:00

date.tcl

git-gui: Localize commit/author dates when displaying them

2007-09-10 01:54:16 -04:00

diff.tcl

git-gui: support for diff3 conflict style

2019-10-04 03:26:15 +05:30

encoding.tcl

git-gui: Optimize encoding name resolution using a lookup table.

2008-09-24 12:48:32 -07:00

error.tcl

git-gui i18n: mark string in lib/error.tcl for translation

2016-10-03 23:40:23 +01:00

git-gui.ico

git-gui: Improve the application icon on Windows.

2007-12-02 23:05:10 -05:00

index.tcl

git-gui: convert new/amend commit radiobutton to checkbutton

2019-09-14 00:37:47 +05:30

line.tcl

git-gui: theme the search and line-number entry fields on blame screen

2011-10-19 12:44:39 +01:00

logo.tcl

git-gui: Refactor Henrik Nyh's logo into its own procedure

2007-10-10 01:12:15 -04:00

merge.tcl

git-gui: maintain backwards compatibility for merge syntax

2016-10-04 23:14:05 +01:00

mergetool.tcl

git-gui: fix the mergetool launcher for the Beyond Compare tool.

2013-02-22 20:13:21 +00:00

option.tcl

git-gui i18n: internationalize use of colon punctuation

2016-10-03 23:39:56 +01:00

remote_add.tcl

git-gui: fix incorrect use of Tcl append command

2016-10-03 23:40:10 +01:00

remote_branch_delete.tcl

git-gui: fix incorrect use of Tcl append command

2016-10-03 23:40:10 +01:00

remote.tcl

git-gui: Mark 'All' in remote.tcl for translation

2016-10-20 11:13:03 +01:00

search.tcl

git-gui: use a tristate to control the case mode in the searchbar

2011-10-21 22:28:23 +01:00

shortcut.tcl

git-gui: fix incorrect use of Tcl append command

2016-10-03 23:40:10 +01:00

spellcheck.tcl

git-gui: correct spelling errors in comments

2013-11-15 20:44:08 +00:00

sshkey.tcl

git-gui: search for all current SSH key types

2018-03-02 15:13:10 -08:00

status_bar.tcl

git-gui: fix git-gui crash due to uninitialized variable

2012-01-22 23:16:03 +00:00

themed.tcl

git-gui: workaround ttk:style theme use

2018-03-05 23:46:45 -08:00

tools_dlg.tcl

git-gui: fix incorrect use of Tcl append command

2016-10-03 23:40:10 +01:00

tools.tcl

git-gui: support for $FILENAMES in tool definitions

2016-10-03 23:27:14 +01:00

transport.tcl

git-gui: fix incorrect use of Tcl append command

2016-10-03 23:40:10 +01:00

win32_shortcut.js

git-gui: Use proper Windows shortcuts instead of bat files

2007-10-12 23:07:58 -04:00

win32.tcl

git-gui: fix shortcut creation on cygwin

2010-07-30 10:05:26 +01:00