##// END OF EJS Templates
commit: explain how to abort commit in editor
Matt Mackall -
r8497:ff22d4c3 default
parent child Browse files
Show More
@@ -1231,6 +1231,7 b' def commitforceeditor(repo, ctx, added, '
1231 edittext.append("") # Empty line between message and comments.
1231 edittext.append("") # Empty line between message and comments.
1232 edittext.append(_("HG: Enter commit message."
1232 edittext.append(_("HG: Enter commit message."
1233 " Lines beginning with 'HG:' are removed."))
1233 " Lines beginning with 'HG:' are removed."))
1234 edittext.append("HG: Leave message empty to abort commit.")
1234 edittext.append("HG: --")
1235 edittext.append("HG: --")
1235 edittext.append(_("HG: user: %s") % ctx.user())
1236 edittext.append(_("HG: user: %s") % ctx.user())
1236 if ctx.p2():
1237 if ctx.p2():
@@ -108,6 +108,7 b' abort: cannot partially commit a merge ('
108
108
109
109
110 HG: Enter commit message. Lines beginning with 'HG:' are removed.
110 HG: Enter commit message. Lines beginning with 'HG:' are removed.
111 HG: Leave message empty to abort commit.
111 HG: --
112 HG: --
112 HG: user: test
113 HG: user: test
113 HG: branch 'default'
114 HG: branch 'default'
General Comments 0
You need to be logged in to leave comments. Login now