#include <memory>
#include "automerge.h"

Include dependency graph for mergeproposal.h:

This graph shows which files directly or indirectly include this file:

Classes
class	MergeProposal
	Holds the result of determining the type of change a "Difference" class represents, and its recommended merge result. More...

Namespaces
namespace	CSIRO
	Top level namespace for all Workspace code.

namespace	CSIRO::Tools

Enumerations
enum	MergeAction { MergeAction_Unknown , MergeAction_Remove , MergeAction_Append , MergeAction_Replace , MergeAction_Ignore , MergeAction_Modify , MergeAction_Reject }
	Which type of merge action is proposed. More...

enum	WorkflowChoice { WorkflowChoice_Workflow1 , WorkflowChoice_Workflow2 , WorkflowChoice_BothWorkflows }
	Which workflows the proposed merge involves. More...

Macro Definition Documentation

◆ CSIRO_TOOLS_MERGEPROPOSAL_H

#define CSIRO_TOOLS_MERGEPROPOSAL_H