From 78da9c97d136f518b535b11f37d6c37103723554 Mon Sep 17 00:00:00 2001
From: Neal Becker <nbecker@fedoraproject.org>
Date: Apr 16 2008 11:10:59 +0000
Subject: Add mergetools.hgrc patch


---

diff --git a/.cvsignore b/.cvsignore
index 4c63fda..15f1911 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 mercurial-1.0.tar.gz
 mercurial-site-start.el
+mercurial-mergetools.hgrc.patch
diff --git a/mercurial-mergetools.hgrc.patch b/mercurial-mergetools.hgrc.patch
new file mode 100644
index 0000000..935c07d
--- /dev/null
+++ b/mercurial-mergetools.hgrc.patch
@@ -0,0 +1,16 @@
+--- 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
diff --git a/mercurial.spec b/mercurial.spec
index b9b3961..24a4d4c 100644
--- a/mercurial.spec
+++ b/mercurial.spec
@@ -9,6 +9,7 @@ Group: Development/Tools
 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 @@ documentation.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 make all
diff --git a/sources b/sources
index 40d7447..b616775 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 9f8dd7fa6f8886f77be9b923f008504c  mercurial-1.0.tar.gz
 04d22d401ce507989137d7171c2502f0  mercurial-site-start.el
+48afc53e60fff52d2283a8c028436abd  mercurial-mergetools.hgrc.patch