mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Add toString to GitMerge/RebaseUpdater for nicer logging.
This commit is contained in:
@@ -245,6 +245,11 @@ public class GitMergeUpdater extends GitUpdater {
|
||||
return changes;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Merge updater";
|
||||
}
|
||||
|
||||
private enum MergeError {
|
||||
CONFLICT,
|
||||
LOCAL_CHANGES,
|
||||
|
||||
@@ -154,6 +154,11 @@ public class GitRebaseUpdater extends GitUpdater {
|
||||
return !cancelled.get();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Rebase updater";
|
||||
}
|
||||
|
||||
private static class MyConflictResolver extends GitConflictResolver {
|
||||
private final GitRebaser myRebaser;
|
||||
private final VirtualFile myRoot;
|
||||
|
||||
Reference in New Issue
Block a user