Edgewall Software

Opened 7 years ago

Last modified 6 years ago

#12920 closed defect

TEXTNote: this is a STARTstrong-1-1TEXTmerge-1-1ENDstrong-1-1 changeset ... — at Initial Version

Reported by: anonymous Owned by:
Priority: normal Milestone: plugin - mercurial
Component: version control/changeset view Version: 1.3dev
Severity: normal Keywords:
Cc: Branch:
Release Notes:
API Changes:
Internal Changes:

Description

Changeset view contains strange text, for example changeset:a311aa01ebcb/mercurial-plugin/ looks like this: 

Parents:
    44:ed4f0932196b (diff), 45:7c49d0e31747 (diff)
    TEXTNote: this is a STARTstrong-1-1TEXTmerge-1-1ENDstrong-1-1 changeset, the changes displayed below correspond to the merge itself.-1-1
    TEXTUse the STARTtt-1-1TEXT(diff)-1-1ENDtt-1-1 links above to see all the changes relative to each parent.-1-1

Maybe only for Mercurial repositories?

Change History (1)

by anonymous, 7 years ago

Attachment: changeset_merge_diff_templating.png​ added
Note: See TracTickets for help on using tickets.