summaryrefslogtreecommitdiff
path: root/devel/mercurial/files/patch-hgmerge
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2005-07-21 09:19:47 +0000
committerPav Lucistnik <pav@FreeBSD.org>2005-07-21 09:19:47 +0000
commit2028f7735bab0b411ff23dcb0d3b72a4b9b9ce90 (patch)
tree29e2262ff41ae7f89a89b8f57baa16cb138397cd /devel/mercurial/files/patch-hgmerge
parent- Update to 1.3.5 (diff)
- Update to 0.6b
PR: ports/83817 Submitted by: Piet Delport <pjd@satori.za.net>
Notes
Notes: svn path=/head/; revision=139804
Diffstat (limited to 'devel/mercurial/files/patch-hgmerge')
-rw-r--r--devel/mercurial/files/patch-hgmerge8
1 files changed, 0 insertions, 8 deletions
diff --git a/devel/mercurial/files/patch-hgmerge b/devel/mercurial/files/patch-hgmerge
deleted file mode 100644
index 317a87b347db..000000000000
--- a/devel/mercurial/files/patch-hgmerge
+++ /dev/null
@@ -1,8 +0,0 @@
---- hgmerge.orig Mon Jul 11 23:59:46 2005
-+++ hgmerge Mon Jul 11 23:59:59 2005
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # hgmerge - default merge helper for Mercurial
- #