aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/merge/WorkTreeUpdater.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix API breakage caused by extracting WorkTreeUpdaterMatthias Sohn2022-11-151-635/+0
| | | | | | | | | | | 448052dc2e made WorkTreeUpdater package visible which breaks API for subclasses of ResolveMerger since they cannot access WorkTreeUpdater. Fix this by moving WorkTreeUpdater into ResolveMerger as a nested class and mark it protected so that subclasses can use it. Bug: 581049 Change-Id: I5a2c4953f8514dc0a1b8041c8e069d28370bb2eb
* Move WorkTreeUpdater to merge packageHan-Wen Nienhuys2022-09-061-0/+635
This avoids making it public with the associated costs for backward compatibility guarantees. Change-Id: I888f313f3854deace8d4cd92f354a6ef0d3b5460