rpms/mercurial
6
0
Fork 0
Code Issues Pull Requests Releases Activity

temporary fix for filemerge bug

Browse Source
This commit is contained in:
Neal Becker 2009-02-07 12:21:41 +00:00
parent ba1ea22221
commit 2ff9cb4b7a
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mercurial-mergetools.hgrc.patch
View File

@ -1,16 +1,12 @@
--- contrib/mergetools.hgrc.orig 2008-03-24 19:05:20.000000000 -0400 --- mercurial-1.1.2/contrib/mergetools.hgrc.orig 2009-02-07 07:14:46.000000000 -0500
+++ contrib/mergetools.hgrc 2008-04-15 15:27:46.000000000 -0400 +++ mercurial-1.1.2/contrib/mergetools.hgrc 2009-02-07 07:14:15.000000000 -0500
@@ -1,11 +1,12 @@ @@ -46,6 +46,6 @@
# Some default global settings for common merge tools ecmerge.regkey=Software\Elli\xc3\xa9 Computing\Merge
ecmerge.gui=True
[merge-tools] -filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
-kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output -filemerge.args=-left $other -right $local -ancestor $base -merge $output
+kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output -filemerge.gui=True
kdiff3.regkey=Software\KDiff3 +#filemerge.executable=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
kdiff3.regappend=\kdiff3.exe +#filemerge.args=-left $other -right $local -ancestor $base -merge $output
kdiff3.fixeol=True +#filemerge.gui=True
kdiff3.gui=True
+kdiff3.priority=1
gvimdiff.args=--nofork -d -g -O $local $other $base
gvimdiff.regkey=Software\Vim\GVim