15 lines
798 B
Diff
15 lines
798 B
Diff
--- cola-1.4.2.5/cola/models/main.py.orig 2010-11-12 15:54:13.000000000 +0100
|
|
+++ cola-1.4.2.5/cola/models/main.py 2010-11-12 15:55:07.000000000 +0100
|
|
@@ -167,9 +167,9 @@ from cola.models.observable import Obser
|
|
'cola_showoutput': 'errors',
|
|
'cola_tabwidth': 8,
|
|
'merge_keepbackup': True,
|
|
- 'diff_tool': os.getenv('GIT_DIFF_TOOL', 'xxdiff'),
|
|
- 'merge_tool': os.getenv('GIT_MERGE_TOOL', 'xxdiff'),
|
|
- 'gui_editor': os.getenv('VISUAL', os.getenv('EDITOR', 'gvim')),
|
|
+ 'diff_tool': os.getenv('GIT_DIFF_TOOL', 'kdiff3'),
|
|
+ 'merge_tool': os.getenv('GIT_MERGE_TOOL', 'kdiff3'),
|
|
+ 'gui_editor': os.getenv('VISUAL', os.getenv('EDITOR', 'kate -u')),
|
|
'gui_historybrowser': 'gitk',
|
|
}
|
|
|