Package ghidra.app.merge.util
package ghidra.app.merge.util
-
ClassesClassDescriptionPanel that shows the current conflict number and the total number of conflicts.
ConflictUtilityprovides some constants and static methods used by the Listing Merge portion of the multi-user merge.MergeUtilitiesprovides generic static methods for use by the multi-user program merge managers.