diff options
| author | Jameson Miller <jamill@microsoft.com> | 2014-04-22 17:25:49 +0400 |
|---|---|---|
| committer | Jameson Miller <jamill@microsoft.com> | 2014-05-03 07:03:28 +0400 |
| commit | 90155789aedd51bc8f2ccb122f48977bc0fccc66 (patch) | |
| tree | 4ee1020c8e6b75552193894fbaa547d54275efad /LibGit2Sharp/Core/GitMergeOpts.cs | |
| parent | 81cb7603bd106ab6d9eefda97dbebe56039d35bb (diff) | |
Update Checkout and Merge options
Checkout methods now use CheckoutOptions
Merge now takes several options:
- Option to specify what is checked out for file conflicts.
- Report CheckoutProgress and CheckoutNotify
- Option to specify MergeFileFavor
Updates for code review feedback
Diffstat (limited to 'LibGit2Sharp/Core/GitMergeOpts.cs')
| -rw-r--r-- | LibGit2Sharp/Core/GitMergeOpts.cs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/LibGit2Sharp/Core/GitMergeOpts.cs b/LibGit2Sharp/Core/GitMergeOpts.cs index 36ccd45f..0c677817 100644 --- a/LibGit2Sharp/Core/GitMergeOpts.cs +++ b/LibGit2Sharp/Core/GitMergeOpts.cs @@ -30,7 +30,7 @@ namespace LibGit2Sharp.Core /// <summary> /// Flags for automerging content. /// </summary> - public GitMergeFileFavorFlags MergeFileFavorFlags; + public MergeFileFavor MergeFileFavorFlags; } /// <summary> @@ -84,12 +84,4 @@ namespace LibGit2Sharp.Core /// </summary> GIT_MERGE_TREE_FIND_RENAMES = (1 << 0), } - - internal enum GitMergeFileFavorFlags - { - GIT_MERGE_FILE_FAVOR_NORMAL = 0, - GIT_MERGE_FILE_FAVOR_OURS = 1, - GIT_MERGE_FILE_FAVOR_THEIRS = 2, - GIT_MERGE_FILE_FAVOR_UNION = 3, - } } |