[Emacs-diffs] emacs-24 65d8ac7: Mention in admin/notes/repo how to mark commits that are not to be merged.

[Eli Zaretskii]

branch: emacs-24
commit 65d8ac7c3729e9416696f77a7add8944e069da92
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Mention in admin/notes/repo how to mark commits that are not to be merged.
---
 admin/notes/repo |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/admin/notes/repo b/admin/notes/repo
index 46a9e08..65bdd2c 100644
--- a/admin/notes/repo
+++ b/admin/notes/repo
@@ -82,7 +82,9 @@ The exception is, if you know that the change will be 
difficult to
 merge to the trunk (eg because the trunk code has changed a lot).
 In that case, it's helpful if you can apply the change to both trunk
 and branch yourself (when committing the branch change, indicate
-in the commit log that it should not be merged to the trunk; see below).
+in the commit log that it should not be merged to the trunk, by
+including the phrase "Not to be merged to master", or any other phrase
+that matches "merge").
 
 * Installing changes from your personal branches.