]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e297f50) | patch
Merge conflict messages: prefix conflict lines with a hash 26/189726/2
authorThomas Wolf <thomas.wolf@paranor.ch>
Sun, 16 Jan 2022 14:50:00 +0000 (15:50 +0100)
committerThomas Wolf <thomas.wolf@paranor.ch>
Sun, 30 Jan 2022 23:42:35 +0000 (00:42 +0100)
commit1fd15e40cc7bf67c30849abc3030de8568246a4e
tree460bd4e5064a310cae1032073a7e6fbe0a0ee4c7tree | snapshot
parente297f503a1674a699969ed61a982c8474f0a23dacommit | diff
Merge conflict messages: prefix conflict lines with a hash

C git also does so. Note that currently the comment character is
hard-coded as the hash '#' throughout JGit.

Bug: 548529
Change-Id: I4a5597694082a9e5b07412b365cfaf41fa034cfa
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeMessageFormatterTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/MergeCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit