# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1582473918 0
# Node ID c67c56b569d80018c40666d1cd7fa56c60010690
# Parent  c1520aabcdd4b91c809c29ff89096bd1f1b79c7c
Add the rebase extension to Mercurial

It appears to be an "official" extension
(https://www.mercurial-scm.org/wiki/RebaseExtension)
and it lets us do "hg pull --rebase" to fix the "modified in two
different places" problem without a merge

diff -r c1520aabcdd4 -r c67c56b569d8 hgrc
--- a/hgrc	Sat Feb 15 13:30:56 2020 +0000
+++ b/hgrc	Sun Feb 23 16:05:18 2020 +0000
@@ -15,6 +15,7 @@
 copush = !$HG commit $@ && $HG push
 
 [extensions]
+rebase =
 extdiff =
 bookmarks =
 hgext.convert=