##// END OF EJS Templates
histedit: end folding message with an LF...
Patrick Mezard -
r17241:c2f13180 stable
parent child Browse files
Show More
@@ -310,7 +310,7 b' def finishfold(ui, repo, ctx, oldctx, ne'
310 newmessage = '\n***\n'.join(
310 newmessage = '\n***\n'.join(
311 [ctx.description()] +
311 [ctx.description()] +
312 [repo[r].description() for r in internalchanges] +
312 [repo[r].description() for r in internalchanges] +
313 [oldctx.description()])
313 [oldctx.description()]) + '\n'
314 # If the changesets are from the same author, keep it.
314 # If the changesets are from the same author, keep it.
315 if ctx.user() == oldctx.user():
315 if ctx.user() == oldctx.user():
316 username = ctx.user()
316 username = ctx.user()
@@ -91,6 +91,7 b' fix up'
91 does not commute with e
91 does not commute with e
92
92
93
93
94
94 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
95 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
95 file e already exists
96 file e already exists
96 1 out of 1 hunks FAILED -- saving rejects to file e.rej
97 1 out of 1 hunks FAILED -- saving rejects to file e.rej
General Comments 0
You need to be logged in to leave comments. Login now