merge_dispatch.h File Reference

#include <kicommon.h>
#include <diff_merge/diff_doc_kind.h>
#include <wx/string.h>

Go to the source code of this file.

Namespaces
namespace	KICAD_DIFF

Functions
int	KICAD_DIFF::DispatchMerge (KIWAY &aKiway, DOC_KIND aKind, const wxString &aAncestor, const wxString &aOurs, const wxString &aTheirs, const wxString &aOutput, bool aInteractive, bool aSingleFile, REPORTER *aReporter)
	Run a 3-way document/library merge by calling the owning kiface's KIFACE_MERGE_DOCUMENT function export (chosen from aKind).
int	KICAD_DIFF::DispatchOpenDiffDialog (KIWAY &aKiway, DOC_KIND aKind, const wxString &aFileA, const wxString &aFileB, const wxString &aLabelA, const wxString &aLabelB, wxWindow *aParent, REPORTER *aReporter=nullptr)
	Open DIALOG_KICAD_DIFF on two files by calling the owning kiface's KIFACE_OPEN_DIFF_DIALOG function export (chosen from aKind).