File: ediff-merg.el.html
Defined variables (5)
ediff-combination-pattern | Pattern to be used for combining difference regions in buffers A and B. |
ediff-default-variant | The variant to be used as a default for buffer C in merging. |
ediff-quit-merge-hook | Hooks to run before quitting a merge job. |
ediff-show-clashes-only | If t, show only diff regions where both buffers disagree with the ancestor. |
ediff-skip-merge-regions-that-differ-from-default | If t, show only the regions that have not been changed by the user. |
Defined functions (12)
ediff-combine-diffs | (N &optional BATCH-INVOCATION) |
ediff-do-merge | (DIFF-NUM &optional REMERGING) |
ediff-get-combined-region | (N) |
ediff-looks-like-combined-merge | (REGION-NUM) |
ediff-merge-changed-from-default-p | (DIFF-NUM &optional PREFERS-TOO) |
ediff-merge-region-is-non-clash | (N) |
ediff-merge-region-is-non-clash-to-skip | (N) |
ediff-re-merge | () |
ediff-set-state-of-all-diffs-in-all-buffers | (CTL-BUF) |
ediff-set-state-of-diff-in-all-buffers | (N CTL-BUF) |
ediff-shrink-window-C | (ARG) |
ediff-skip-merge-region-if-changed-from-default-p | (N) |