]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ddc4371) | patch
Let ediff '=' compare against ancestor buffer (Bug#11320)
authorNoam Postavsky <npostavs@gmail.com>
Sat, 12 May 2018 01:56:56 +0000 (21:56 -0400)
committerNoam Postavsky <npostavs@gmail.com>
Fri, 29 Jun 2018 02:09:04 +0000 (22:09 -0400)
commit591bb3d90018ebbcf79e6d496ed73ef396a58887
tree89143901353c294adf4fd485eff608269e6492b5tree | snapshot
parentddc4371a89e5500e0203bed4b0ad453925b1c74fcommit | diff
Let ediff '=' compare against ancestor buffer (Bug#11320)

* lisp/vc/ediff-util.el (ediff-inferior-compare-regions): Ask user
whether to compare against the ancestor or merge buffer.  Use
read-multiple-choice for A vs B buffer query.
lisp/vc/ediff-util.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.