5#include "../GitTypes.h"
14 void Open(
const std::string& commitOid,
const std::string& commitSummary);
19 bool mJustOpened =
false;
25 std::vector<std::string> mBranchNames;
26 int32_t mSelectedSourceBranch = 0;
29 std::string mTargetCommitOid;
30 std::string mTargetCommitSummary;
32 std::string mCurrentBranch;
33 bool mNoFastForward =
false;
35 bool mMergeInProgress =
false;
36 bool mMergeDone =
false;
37 std::string mMergeResult;
38 int32_t mMergeResultLevel = 0;
41GitMergeDialog* GetGitMergeDialog();