Beta v0.2.12
Pre-release
Pre-release
Requires .NET 4.6.1, git v2.11.0+ and git-lfs v1.5.5+
fixed keep ours/theirs on merged changes not working (regression)
Requires .NET 4.6.1, git v2.11.0+ and git-lfs v1.5.5+
fixed keep ours/theirs on merged changes not working (regression)