repo merge

Usage: libfossil repo merge <version> [flags]

Merge a divergent version

Arguments:
  <version>    Version to merge into current checkout

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

      --remote=STRING       Required-content peer URL (default: saved
                            last-sync-url)
      --sync-user=STRING    Required-content authentication user
      --sync-pass=STRING    Required-content password (never saved)
      --sync-private        Allow recovery of private required artifacts
      --timeout=10m         Required-content deadline; 0 disables it
      --strategy=STRING     Override merge strategy for all files
      --dry-run             Show what would be merged without writing
  -d, --dir="."             Checkout directory