blob: c6a9b1b1f096dc26fff557eca87947aef8cc5377 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
namespace LibGit2Sharp
{
/// <summary>
/// Disambiguates the different versions of an index entry during a merge.
/// </summary>
public enum StageLevel
{
/// <summary>
/// The standard fully merged state for an index entry.
/// </summary>
Staged = 0,
/// <summary>
/// Version of the entry as it was in the common base merge commit.
/// </summary>
Ancestor = 1,
/// <summary>
/// Version of the entry as it is in the commit of the Head.
/// </summary>
Ours = 2,
/// <summary>
/// Version of the entry as it is in the commit being merged.
/// </summary>
Theirs = 3,
}
}
|