diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2018-05-11 21:56:56 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-06-28 22:09:04 -0400 |
| commit | 591bb3d90018ebbcf79e6d496ed73ef396a58887 (patch) | |
| tree | 89143901353c294adf4fd485eff608269e6492b5 /lib/count-one-bits.h | |
| parent | ddc4371a89e5500e0203bed4b0ad453925b1c74f (diff) | |
| download | emacs-591bb3d90018ebbcf79e6d496ed73ef396a58887.tar.gz emacs-591bb3d90018ebbcf79e6d496ed73ef396a58887.tar.bz2 emacs-591bb3d90018ebbcf79e6d496ed73ef396a58887.zip | |
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.
Diffstat (limited to 'lib/count-one-bits.h')
0 files changed, 0 insertions, 0 deletions