addedmethod:
createParamInfoConflictPanel
ghidra.app.merge.listing.VariousChoicesPanel createParamInfoConflictPanel(ghidra.program.model.listing.Function[] functions, ghidra.app.merge.listing.AbstractFunctionMerger.ParamInfoConflict pc, ghidra.util.task.TaskMonitor monitor)
addedfield:
externalDetailConflicts
ghidra.util.datastruct.ObjectIntHashtable<ghidra.program.model.address.Address> externalDetailConflicts
addedmethod:
initializeAutoMerge
void initializeAutoMerge(java.lang.String progressMessage, int progressMin, int progressMax, ghidra.util.task.TaskMonitor monitor)
addedmethod:
mergeBasicExternalDetail
void mergeBasicExternalDetail(int type, ghidra.program.model.symbol.ExternalLocation[] externalLocations, int currentChosenOption, ghidra.util.task.TaskMonitor monitor) throws CancelledException
addedmethod:
saveFunctionDetailConflict
void saveFunctionDetailConflict(ghidra.program.model.listing.Function[] functions, int type)