issues
search
Praqma
/
git-merge-driver
Example of how to configure a custom git merge driver
MIT License
102
stars
16
forks
source link
issues
Newest
Newest
Most commented
Recently updated
Oldest
Least commented
Least recently updated
to this example added ours/theirs policies and moved my-file.mrg to /lib direcory
#4
AlexeiKharchev
opened
8 months ago
0
Does this work with git mergetool?
#2
JobaDiniz
opened
1 year ago
1
Is it possible to create this configuration artifact with CLI commands?
#1
rulatir
opened
2 years ago
1