(merge-begin, merge-end, template, A-begin, A-end, B-begin, B-end, diff,
commitbbf40036a9d95bb8e4204d89e83372af297102c5
authorJuanma Barranquero <lekktu@gmail.com>
Wed, 24 Aug 2005 11:36:27 +0000 (24 11:36 +0000)
committerJuanma Barranquero <lekktu@gmail.com>
Wed, 24 Aug 2005 11:36:27 +0000 (24 11:36 +0000)
treec0a3b34cc2ff0c26b2a8a5d492bdaf04a0b5a6e2
parent63f0a16643b6e7d0fa0707a955bc27f46e8e7f36
(merge-begin, merge-end, template, A-begin, A-end, B-begin, B-end, diff,
diff-vector, valid-diff): Defvar at compile time to silence the byte-compiler.
lisp/ChangeLog
lisp/emerge.el