message no. 49522
Posted by KrofDrakula in #github at 2014-09-25T20:48:35Z
anyone here used .gitattributes merge attribute? i'm having trouble implementing a custom merge driver with git 1.7.2.5 on debian: https://gist.github.com/KrofDrakula/9e4a880cf58bf6fb4444