Mercurial > hg

diff contrib/editmerge @ 26421:4b0fc75f9403

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
urls: bulk-change primary website URLs
author Matt Mackall <mpm@selenic.com>
date Wed, 30 Sep 2015 15:43:49 -0500
parents 864c56cb8945
children 58b04a538caa
line wrap: on
line diff
--- a/contrib/editmerge	Wed Sep 30 15:31:07 2015 -0500
+++ b/contrib/editmerge	Wed Sep 30 15:43:49 2015 -0500
@@ -16,7 +16,7 @@
   grep -n "<<<<<<" $FILE | cut -f1 -d:
 }
 
-# editor preference loosely based on http://mercurial.selenic.com/wiki/editor
+# editor preference loosely based on https://mercurial-scm.org/wiki/editor
 # hg showconfig is at the bottom though, since it's slow to run (0.15 seconds)
 ED=$HGEDITOR
 if [ "$ED" = "" ] ; then