UNPKG

git-resolve-conflict

Version:

Resolve git conflict in a given file, using given strategy (--ours, --theirs, --union)

github.com/jakub-g/git-resolve-conflict

jakub-g/git-resolve-conflict

6 lines (3 loc) • 63 B
1
2
3
4
5
6
# Changelog ## 2.0.0 Compatibility with non-bash shells