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
lib	git-gui: support for diff3 conflict style	2019-10-04 03:26:15 +05:30
macosx	git-gui: Make git-gui lib dir configurable at runime	2014-08-10 12:48:28 +01:00
po	treewide: correct several "up-to-date" to "up to date"	2019-09-24 19:48:27 +05:30
windows	git-gui: chmod +x po2msg, windows/git-gui.sh	2014-01-18 17:06:41 +00:00
.gitattributes	Fix build with core.autocrlf=true	2019-09-24 19:48:27 +05:30
.gitignore	git-gui: Honor a config.mak in git-gui's top level	2007-10-13 22:14:14 -04:00
GIT-VERSION-GEN	git-gui: set version 0.21	2016-10-20 11:19:43 +01:00
Makefile	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
git-gui--askpass	git-gui: ensure correct application termination in git-gui--askpass	2010-08-18 23:19:24 +01:00
git-gui.sh	git-gui: support for diff3 conflict style	2019-10-04 03:26:15 +05:30