(add-change-log-entry): Don't call find-file at all if we're already in the proper buffer. (change-log-resolve-conflict): New fun. (change-log-mode): Use it and use define-derived-mode. (change-log-merge): Allow other-log to be a buffer. Don't add a \n if there are already enough \n's.