]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0f4af2b) | patch
Merge: Add diff3 style merge conflict formatter. 80/148280/5
authorHaamed Gheibi <gheibi@gmail.com>
Tue, 25 Jul 2023 00:50:34 +0000 (17:50 -0700)
committerHaamed Gheibi <gheibi@gmail.com>
Mon, 31 Jul 2023 18:57:28 +0000 (11:57 -0700)
commit462c57ec8d94b23e21479394ee7880e0fc1bb832
tree68fde3035945ae30cdc090658eec6549d99efab9tree | snapshot
parent0f4af2bc3642b419b4e1b10b84624e9a3ed8a443commit | diff
Merge: Add diff3 style merge conflict formatter.

Add base section to the merge conflict hunks.

Bug: 442284
Change-Id: I977b43e7dd8119d6b72d11f09c4e8ec241750383
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeChunk.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatterPass.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit