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

4 files

	Filename	Content Type	Size
	../
	git-resolve-conflict	application/octet-stream	463 B
	git-resolve-ours	application/octet-stream	537 B
	git-resolve-theirs	application/octet-stream	539 B
	git-resolve-union	application/octet-stream	538 B