diff options
| author | Haamed Gheibi <gheibi@gmail.com> | 2023-07-24 17:50:34 -0700 |
|---|---|---|
| committer | Haamed Gheibi <gheibi@gmail.com> | 2023-07-31 11:57:28 -0700 |
| commit | 462c57ec8d94b23e21479394ee7880e0fc1bb832 (patch) | |
| tree | 68fde3035945ae30cdc090658eec6549d99efab9 /org.eclipse.jgit.packaging | |
| parent | 0f4af2bc3642b419b4e1b10b84624e9a3ed8a443 (diff) | |
| download | jgit-462c57ec8d94b23e21479394ee7880e0fc1bb832.tar.gz jgit-462c57ec8d94b23e21479394ee7880e0fc1bb832.zip | |
Merge: Add diff3 style merge conflict formatter.
Add base section to the merge conflict hunks.
Bug: 442284
Change-Id: I977b43e7dd8119d6b72d11f09c4e8ec241750383
Diffstat (limited to 'org.eclipse.jgit.packaging')
0 files changed, 0 insertions, 0 deletions