Mercurial > emacs
diff lisp/vc/ediff-merg.el @ 110001:87dd0fd298be
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 22 Aug 2010 22:56:05 +0000 |
parents | c77749185234 |
children | 1b626601d32d |
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 22 Aug 2010 22:56:05 +0000 |
parents | c77749185234 |
children | 1b626601d32d |