Lines Matching refs:mine
73 Used in `smerge-diff-base-mine' and related functions."
82 (defface smerge-mine
94 (put 'smerge-mine-face 'face-alias 'smerge-mine)
95 (defvar smerge-mine-face 'smerge-mine)
144 ("m" . smerge-keep-mine)
150 ("=<" "base-mine" . smerge-diff-base-mine)
152 ("==" "mine-other" . smerge-diff-mine-other))
190 ["Keep Yours" smerge-keep-mine :help "Keep your version"
193 ["Diff Base/Mine" smerge-diff-base-mine
194 :help "Diff `base' and `mine' for current conflict"
199 ["Diff Mine/Other" smerge-diff-mine-other
200 :help "Diff `mine' and `other' for current conflict"
215 "Context menu for mine area in `smerge-mode'."
226 (1 smerge-mine-face prepend t)
257 (defconst smerge-match-names ["conflict" "mine" "base" "other"])
431 (defun smerge-keep-mine ()
472 (defun smerge-diff-base-mine ()
473 "Diff 'base' and 'mine' version in current conflict region."
482 (defun smerge-diff-mine-other ()
483 "Diff 'mine' and 'other' version in current conflict region."
503 (mine-start (match-end 0))
514 (mine-end (match-beginning 0))
522 (goto-char mine-start)
535 (setq base-end mine-end)
536 (setq mine-end (match-beginning 0))
549 (setq base-start mine-start)
550 (setq base-end mine-end)
551 (setq mine-start other-start)
552 (setq mine-end other-end)))
555 mine-start mine-end
749 (defun smerge-ediff (&optional name-mine name-other name-base)
759 (mine (generate-new-buffer
760 (or name-mine (concat "*" filename " MINE*"))))
764 (with-current-buffer mine
804 (ediff-merge-buffers-with-ancestor mine other base)
806 (ediff-merge-buffers mine other)))