command_git_mergedriver.cpp File Reference

#include "command_git_mergedriver.h"
#include <cli/exit_codes.h>
#include <diff_merge/merge_dispatch.h>
#include <string_utils.h>
#include <wildcards_and_files_ext.h>
#include <wx/crt.h>
#include <wx/filename.h>
#include <wx/stdpaths.h>

Go to the source code of this file.

Macros
#define	ARG_KIND   "--kind"
#define	ARG_ANCESTOR   "ancestor"
#define	ARG_OURS   "ours"
#define	ARG_THEIRS   "theirs"
#define	ARG_OUTPUT_F   "--output"

Macro Definition Documentation

ARG_ANCESTOR

#define ARG_ANCESTOR   "ancestor"

Definition at line 37 of file command_git_mergedriver.cpp.

Referenced by CLI::GIT_MERGEDRIVER_COMMAND::doPerform(), CLI::MERGETOOL_COMMAND::doPerform(), CLI::GIT_MERGEDRIVER_COMMAND::GIT_MERGEDRIVER_COMMAND(), and CLI::MERGETOOL_COMMAND::MERGETOOL_COMMAND().

ARG_KIND

#define ARG_KIND   "--kind"

Definition at line 36 of file command_git_mergedriver.cpp.

Referenced by CLI::GIT_MERGEDRIVER_COMMAND::doPerform(), and CLI::GIT_MERGEDRIVER_COMMAND::GIT_MERGEDRIVER_COMMAND().

ARG_OURS

#define ARG_OURS   "ours"

Definition at line 38 of file command_git_mergedriver.cpp.

Referenced by CLI::GIT_MERGEDRIVER_COMMAND::doPerform(), CLI::MERGETOOL_COMMAND::doPerform(), CLI::GIT_MERGEDRIVER_COMMAND::GIT_MERGEDRIVER_COMMAND(), and CLI::MERGETOOL_COMMAND::MERGETOOL_COMMAND().

ARG_OUTPUT_F

#define ARG_OUTPUT_F   "--output"

Definition at line 40 of file command_git_mergedriver.cpp.

Referenced by CLI::GIT_MERGEDRIVER_COMMAND::doPerform(), CLI::MERGETOOL_COMMAND::doPerform(), CLI::GIT_MERGEDRIVER_COMMAND::GIT_MERGEDRIVER_COMMAND(), and CLI::MERGETOOL_COMMAND::MERGETOOL_COMMAND().

ARG_THEIRS

#define ARG_THEIRS   "theirs"

Definition at line 39 of file command_git_mergedriver.cpp.

Referenced by CLI::GIT_MERGEDRIVER_COMMAND::doPerform(), CLI::MERGETOOL_COMMAND::doPerform(), CLI::GIT_MERGEDRIVER_COMMAND::GIT_MERGEDRIVER_COMMAND(), and CLI::MERGETOOL_COMMAND::MERGETOOL_COMMAND().