change-log-resolve-conflict

change-log-resolve-conflict is a compiled Lisp function in `add-log.el'.

(change-log-resolve-conflict)

Function to be used in `smerge-resolve-function'.