git-resolve-conflict
Version:
Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)
537 B
Binary
No preview is available for this file.
Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)