Bug 548529 - Conflict lines in MERGE_MSG not prefixed with #
Summary: Conflict lines in MERGE_MSG not prefixed with #
Status: RESOLVED FIXED
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: 5.5   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: 6.1   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-06-21 15:45 EDT by Thomas Wolf CLA
Modified: 2022-01-31 17:05 EST (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Thomas Wolf CLA 2019-06-21 15:45:41 EDT 
MergeMessageFormatter.addConflictsMessage() should prefix all lines with # like native git does.

JGit also adds an empty line before "Conflicts" that isn't present in a MERGE_MSG file written by canonical git for a merge/rebase/cherry-pick conflict.
Comment 1 Thomas Wolf CLA 2019-11-14 11:09:01 EST 
Actually, it should prefix them with core.commentChar.
Comment 2 Eclipse Genie CLA 2022-01-17 18:29:24 EST 
New Gerrit change created: https://git.eclipse.org/r/c/jgit/jgit/+/189726