Search
git-resolve-conflict
Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)
1.0.0
1.0.1
1.1.2
1.1.3
1.1.4
1.1.5
1.1.6
2.0.0
Browse on unpkg
