add .diff files when create .conflict

[halueda]

auto-sync generates .conflict file when it find conflict (both side update).
Sometimes it is difficult to make diff file of both file at the moment, if the file is contiuously modified.

if .diff file is generated when the conflict file is generated, the merge could be easier.