|
From: | Dmitry Alexandrov |
Subject: | Re: Making git as easy as CVS, for handling merge conflicts |
Date: | Mon, 11 Nov 2019 21:34:34 +0300 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
* ediff-setup-windows-plain-merge(#<buffer init.el> #<buffer init.el~> #<buffer *ediff-merge*> #<buffer *Ediff Control Panel*>) ediff-setup-windows-plain(#<buffer init.el> #<buffer init.el~> #<buffer *ediff-merge*> #<buffer *Ediff Control Panel*>) ediff-setup-windows(#<buffer init.el> #<buffer init.el~> #<buffer *ediff-merge*> #<buffer *Ediff Control Panel*>) ediff-setup(#<buffer init.el> "/home/dag/.emacs.d/init.el" #<buffer init.el~> "/home/dag/.emacs.d/init.el~" nil nil (ediff-merge-on-startup) ((ediff-job-name . ediff-merge-files)) nil) ediff-files-internal("/home/dag/.emacs.d/init.el" "/home/dag/.emacs.d/init.el~" nil (ediff-merge-on-startup) ediff-merge-files nil) ediff-merge("/home/dag/.emacs.d/init.el" "/home/dag/.emacs.d/init.el~") funcall-interactively(ediff-merge "/home/dag/.emacs.d/init.el" "/home/dag/.emacs.d/init.el~")But indeed, as it shows, I was mistaken: out of a box it make _four_ windows when running on TTY: 2 revisions, merge + control, though the last is not very noticeable.
signature.asc
Description: PGP signature
[Prev in Thread] | Current Thread | [Next in Thread] |