From: Mathieu Lirzin <mthl@gnu.org>
Date: Wed, 20 Sep 2017 10:50:25 +0000 (+0200)
Subject: maint: 'master' should be merged into 'next'
X-Git-Tag: v1.16~27
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5f1e0dde32c4f42fe609433c42dcd6c412abb667;p=thirdparty%2Fautomake.git

maint: 'master' should be merged into 'next'

* HACKING: Fix instructions merge instructions.
---

diff --git a/HACKING b/HACKING
index a603b6953..8e7764baf 100644
--- a/HACKING
+++ b/HACKING
@@ -178,7 +178,7 @@
   over-arching change, you should use a dedicated topic branch, and
   only merge that back once it is reasonably stable.
 
-* The 'next' branch should be kept regularly merged into the 'master'
+* The 'master' branch should be kept regularly merged into the 'next'
   branch.  It is advisable to merge only after a set of related
   commits have been applied, to avoid introducing too much noise in
   the history.