git-merge-driver
git-merge-driver copied to clipboard
to this example added ours/theirs policies and moved my-file.mrg to /lib direcory