rpms/mercurial/devel mercurial.spec,1.61,1.62

Neal Becker nbecker at fedoraproject.org
Sat Feb 7 12:26:41 UTC 2009


Author: nbecker

Update of /cvs/pkgs/rpms/mercurial/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30645

Modified Files:
	mercurial.spec 
Log Message:
Fix install mergetools.rc



Index: mercurial.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- mercurial.spec	7 Feb 2009 12:23:53 -0000	1.61
+++ mercurial.spec	7 Feb 2009 12:26:11 -0000	1.62
@@ -149,7 +149,7 @@
 %{_bindir}/mercurial-convert-repo
 %dir %{_sysconfdir}/mercurial
 %dir %{_sysconfdir}/mercurial/hgrc.d
-%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc.sample
+%{_sysconfdir}/mercurial/hgrc.d/mergetools.rc
 %dir %{python_sitearch}/mercurial
 %dir %{python_sitearch}/hgext
 
@@ -169,7 +169,7 @@
 
 %changelog
 * Sat Feb  7 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-3
-- Patch mergetools.hgrc to fix filemerge bug
+- Patch mergetools.rc to fix filemerge bug
 
 * Thu Jan  1 2009 Neal Becker <ndbecker2 at gmail.com> - 1.1.2-2
 - Rename mergetools.rc -> mergetools.rc.sample




More information about the scm-commits mailing list