add merge-log merge-diff commands