comparison lisp/ediff-merg.el @ 106685:7bbfbaf5bbf0

* doc/emacs/building.texi: Re-apply revno 99212, which was accidentally overwritten in the last change.
author Chong Yidong <cyd@stupidchicken.com>
date Wed, 30 Dec 2009 05:39:47 -0500
parents 403125cdfb24
children 1d1d5d9bd884
comparison
equal deleted inserted replaced
106684:232c05e79d96 106685:7bbfbaf5bbf0