merge rsyncable doc diff