-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Zack Weinberg schreef:
| Dealing with nccs *is* just a simple matter of programming, and for | your case (willing to put up with merge-right-now, only care about | add/add conflict) I think there could be a hackish solution where we | throw those into the content_merge lua hook too. | | Are you willing to attempt to code it? If so, I can commit to | reviewing and/or offering implementation advice. (I do not have time | to do it myself. Also I may be offline all of next week.) Would this need lua or c++ code? I could have a look at piecing together some lua code on sunday. regards, Koen -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Darwin) iD8DBQFH2aYxMkyGM64RGpERAkkyAJ4j1XPDUFP3wQjA1HpL6ujRBamZrACfdCz5 bU1+gMZAQyWLeg5DY0/xCvA= =r41N -----END PGP SIGNATURE----- _______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
