Skip to content

Commit

Permalink
Merge pull request #714 from Amorymeltzer/tag-fixmergeto
Browse files Browse the repository at this point in the history
tag: Fix regression leaving generic {{merge}} instead of {{merge to}} or {{merge from}}
  • Loading branch information
Amorymeltzer committed Sep 30, 2019
2 parents bab8522 + 743e821 commit 76fed61
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions modules/friendlytag.js
Original file line number Diff line number Diff line change
Expand Up @@ -1523,6 +1523,7 @@ Twinkle.tag.callbacks = {
case 'Merge':
case 'Merge to':
case 'Merge from':
params.mergeTag = tagName;
if (params.mergeTarget) {
// normalize the merge target for now and later
params.mergeTarget = Morebits.string.toUpperCaseFirstChar(params.mergeTarget.replace(/_/g, ' '));
Expand Down

0 comments on commit 76fed61

Please sign in to comment.