PageRenderTime 17ms CodeModel.GetById 13ms app.highlight 1ms RepoModel.GetById 1ms app.codeStats 0ms

/Mercurial.Net/ResolveAction.cs

#
C# | 29 lines | 10 code | 3 blank | 16 comment | 0 complexity | c70fa0597be2e48d2444e118f7cd1641 MD5 | raw file
 1namespace Mercurial
 2{
 3    /// <summary>
 4    /// This enum is used by <see cref="ResolveCommand"/>.<see cref="ResolveCommand.Action">Action</see> to specify
 5    /// which action to take on the files selected.
 6    /// </summary>
 7    public enum ResolveAction
 8    {
 9        /// <summary>
10        /// Mark the selected files as resolved.
11        /// </summary>
12        MarkResolved,
13
14        /// <summary>
15        /// Mark the selected files as unresolved.
16        /// </summary>
17        MarkUnresolved,
18
19        /// <summary>
20        /// Attempt to redo the merge operation.
21        /// </summary>
22        RedoMerge,
23
24        /// <summary>
25        /// List the resolution status of the selected files.
26        /// </summary>
27        List,
28    }
29}