git-resolve-conflict

Version:

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

1 file

	Filename	Content Type	Size
	../
	git-resolve-conflict.sh	application/octet-stream	1.39 kB