diff options
| author | crumblycake <angusbjones@outlook.com> | 2013-12-05 15:31:18 +0400 |
|---|---|---|
| committer | Jameson Miller <jamill@microsoft.com> | 2014-01-16 18:21:49 +0400 |
| commit | cc4bb2da1de35122860993cb1f5c9fae7a724f59 (patch) | |
| tree | d3f68c1c7949cd544af2d3a588797b45861b499d /LibGit2Sharp/LibGit2Sharp.csproj | |
| parent | 9165ae30d4cff10681b5b65f094d0d4320426b6e (diff) | |
Initial merge functionality.
Bring initial merge functionality to LibGit2Sharp.
Diffstat (limited to 'LibGit2Sharp/LibGit2Sharp.csproj')
| -rw-r--r-- | LibGit2Sharp/LibGit2Sharp.csproj | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj index 54fc4b9c..26e5aec3 100644 --- a/LibGit2Sharp/LibGit2Sharp.csproj +++ b/LibGit2Sharp/LibGit2Sharp.csproj @@ -78,19 +78,25 @@ <Compile Include="Core\Handles\PatchSafeHandle.cs" /> <Compile Include="Core\IntPtrExtensions.cs" /> <Compile Include="FetchOptions.cs" /> + <Compile Include="MergeResult.cs" /> <Compile Include="RefSpec.cs" /> <Compile Include="RefSpecCollection.cs" /> <Compile Include="Core\EncodingMarshaler.cs" /> + <Compile Include="Core\GitMergeOpts.cs" /> + <Compile Include="Core\GitMergeTreeOpts.cs" /> <Compile Include="Core\Handles\BranchIteratorSafeHandle.cs" /> <Compile Include="Core\Handles\ConfigurationIteratorSafeHandle.cs" /> <Compile Include="Core\GitBlame.cs" /> <Compile Include="Core\Handles\BlameSafeHandle.cs" /> + <Compile Include="Core\Handles\GitMergeHeadHandle.cs" /> + <Compile Include="Core\Handles\GitMergeResultHandle.cs" /> <Compile Include="Core\PushTransferProgressCallbacks.cs" /> <Compile Include="Core\PackbuilderCallbacks.cs" /> <Compile Include="HistoryDivergence.cs" /> <Compile Include="PushOptions.cs" /> <Compile Include="Core\GitBuf.cs" /> <Compile Include="FilteringOptions.cs" /> + <Compile Include="Core\GitMergeResult.cs" /> <Compile Include="ResetMode.cs" /> <Compile Include="NoteCollectionExtensions.cs" /> <Compile Include="RefSpecDirection.cs" /> |