Mercurial > emacs

comparison man/ediff.texi @ 52979:3649390c0f91

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace @sc{ascii} and ASCII with @acronym{ASCII}.
author Eli Zaretskii <eliz@gnu.org>
date Sun, 02 Nov 2003 07:01:19 +0000
parents 980a04480377
children b1ae5333057a
comparison
equal deleted inserted replaced
52978:1a5c50faf357 52979:3649390c0f91
639 639
640 @item h 640 @item h
641 @kindex h 641 @kindex h
642 Cycles between full highlighting, the mode where fine differences are not 642 Cycles between full highlighting, the mode where fine differences are not
643 highlighted (but computed), and the mode where highlighting is done with 643 highlighted (but computed), and the mode where highlighting is done with
644 ASCII strings. The latter is not really recommended, unless on a dumb TTY. 644 @acronym{ASCII} strings. The latter is not really recommended, unless on a dumb TTY.
645 645
646 @item r 646 @item r
647 @kindex r 647 @kindex r
648 Restores the old contents of the region in the merge buffer. 648 Restores the old contents of the region in the merge buffer.
649 (If you copied a difference region from buffer A or B into the merge buffer 649 (If you copied a difference region from buffer A or B into the merge buffer