Commit 71d273583755c0a2b7f5d608f017f4586add51e4
2012-07-19T10:23:45
Fix bug with merging diffs with null options A diff that is created with a NULL options parameter could result in a NULL prefix string, but diff merge was unconditionally strdup'ing it. I added a test to replicate the issue and then a new method that does the right thing with NULL values.