to this example added ours/theirs policies and moved my-file.mrg to /lib direcory - Githubissues

Praqma / git-merge-driver

Example of how to configure a custom git merge driver

MIT License

102 stars 16 forks source link

to this example added ours/theirs policies and moved my-file.mrg to /lib direcory #4

Open AlexeiKharchev opened 8 months ago