Skip to content

Commit 96e03dc

Browse files
committed
end quote comes after the shorthand
1 parent 92833d6 commit 96e03dc

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

lib/repository.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,11 +1435,12 @@ Repository.prototype.mergeBranches = function(
14351435
"Merge " +
14361436
mergeDecorator +
14371437
" '" +
1438-
fromBranch.shorthand();
1438+
fromBranch.shorthand() +
1439+
"'";
14391440

14401441
// https://github.com/git/git/blob/master/builtin/fmt-merge-msg.c#L456-L459
14411442
if (toBranch.shorthand() !== "master") {
1442-
message += "' into " + toBranch.shorthand();
1443+
message += " into " + toBranch.shorthand();
14431444
}
14441445

14451446
return Promise.all([oid, processMergeMessageCallback(message)]);

0 commit comments

Comments
 (0)