dialog_kicad_merge_3way.h File Reference

#include "dialog_kicad_merge_3way_base.h"
#include <diff_merge/diff_scene.h>
#include <diff_merge/kicad_merge_engine.h>
#include <functional>
#include <map>
#include <optional>

Go to the source code of this file.

Classes
class	DIALOG_KICAD_MERGE_3WAY
	Resolve a three-way merge by choosing a version for each conflicting item. More...
struct	DIALOG_KICAD_MERGE_3WAY::CONFLICT_CONTEXT
	Phase 8 context for the conflict canvas. More...