aboutsummaryrefslogtreecommitdiffstats
path: root/devel/mercurial/files/patch-hgmerge
diff options
context:
space:
mode:
Diffstat (limited to 'devel/mercurial/files/patch-hgmerge')
-rw-r--r--devel/mercurial/files/patch-hgmerge8
1 files changed, 8 insertions, 0 deletions
diff --git a/devel/mercurial/files/patch-hgmerge b/devel/mercurial/files/patch-hgmerge
new file mode 100644
index 000000000000..317a87b347db
--- /dev/null
+++ b/devel/mercurial/files/patch-hgmerge
@@ -0,0 +1,8 @@
+--- 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
+ #