repo mark-resolved

Usage: libfossil repo mark-resolved <file> [flags]

Mark a conflict as resolved

Arguments:
  <file>    File to mark as resolved

Flags:
  -h, --help           Show context-sensitive help.
  -R, --repo=STRING    Path to repository file
  -v, --verbose        Verbose output

  -d, --dir="."        Checkout directory