PageRenderTime 47ms CodeModel.GetById 18ms 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
Possible License(s): BSD-3-Clause, GPL-2.0
  1. namespace 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. /// <summary>
  14. /// Mark the selected files as unresolved.
  15. /// </summary>
  16. MarkUnresolved,
  17. /// <summary>
  18. /// Attempt to redo the merge operation.
  19. /// </summary>
  20. RedoMerge,
  21. /// <summary>
  22. /// List the resolution status of the selected files.
  23. /// </summary>
  24. List,
  25. }
  26. }