rpms/mercurial/devel mercurial-mergetools.hgrc.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 mercurial.spec, 1.41, 1.42 sources, 1.17, 1.18

[Neal Becker (nbecker)]

Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27426

Modified Files:
	.cvsignore mercurial.spec sources 
Added Files:
	mercurial-mergetools.hgrc.patch 
Log Message:
Add mergetools.hgrc patch


mercurial-mergetools.hgrc.patch:

--- NEW FILE mercurial-mergetools.hgrc.patch ---
--- contrib/mergetools.hgrc.orig	2008-03-24 19:05:20.000000000 -0400
+++ contrib/mergetools.hgrc	2008-04-15 15:27:46.000000000 -0400
@@ -1,11 +1,12 @@
 # Some default global settings for common merge tools
 
 [merge-tools]
-kdiff3.args=--auto -L1 base --L2 local --L3 other $base $local $other -o $output
+kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
 kdiff3.regkey=Software\KDiff3
 kdiff3.regappend=\kdiff3.exe
 kdiff3.fixeol=True
 kdiff3.gui=True
+kdiff3.priority=1
 
 gvimdiff.args=--nofork -d -g -O $local $other $base
 gvimdiff.regkey=Software\Vim\GVim


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	10 Apr 2008 11:17:39 -0000	1.15
+++ .cvsignore	16 Apr 2008 11:10:59 -0000	1.16
@@ -1,2 +1,3 @@
 mercurial-1.0.tar.gz
 mercurial-site-start.el
+mercurial-mergetools.hgrc.patch


Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mercurial.spec	12 Apr 2008 13:54:53 -0000	1.41
+++ mercurial.spec	16 Apr 2008 11:10:59 -0000	1.42
@@ -9,6 +9,7 @@
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
 Source1: mercurial-site-start.el
+Patch0: mercurial-mergetools.hgrc.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: python-devel asciidoc xmlto
 BuildRequires: emacs emacs-el 
@@ -78,6 +79,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 make all


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	10 Apr 2008 11:17:39 -0000	1.17
+++ sources	16 Apr 2008 11:10:59 -0000	1.18
@@ -1,2 +1,3 @@
 9f8dd7fa6f8886f77be9b923f008504c  mercurial-1.0.tar.gz
 04d22d401ce507989137d7171c2502f0  mercurial-site-start.el
+48afc53e60fff52d2283a8c028436abd  mercurial-mergetools.hgrc.patch