Damian Krzeminski wrote: > About not being able to apply the patch. It's strange. Did you use: > git am -3 > and > git mergetool > when applying the patch?
Ah, I didn't do git am -3, just git am. Didn't think to try mergetool.. _______________________________________________ sipx-dev mailing list [email protected] List Archive: http://list.sipfoundry.org/archive/sipx-dev Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev
