diff admin/bzrmerge.el @ 112098:40af77a50adc

Merge changes from emacs-23 branch
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 02 Jan 2011 15:28:40 -0500
parents b0a317b18658
children 978fe18f0882
line wrap: on
line diff