> - sprintf(cmdbuf, DIFF " -Nu %.250s %.250s | %.250s", old, new, p); > + sprintf(cmdbuf, DIFF " -N \"%.250s\" \"%.250s\" | %.250s", old, new, p);
Ouch, sorry about that. What do you about 2-way merge otherwise, however? Would it be a better idea to skip it altogether, start storing the original conffiles and implement 3-way instead? Personally, I not sure anymore if it would really be worth it - you would still have to check each hunk manually because even a non-conflicting automatic merge can quite easily break the semantics of a configuration file. For example, adding a path field in the middle of a file could work fine with the defaults but might unintentionally override the values a user had specified earlier on the first line. - Jarno
