comparison lisp/smerge-mode.el @ 77782:bde249020282

Transfer changes to branch
author Jason Rumney <jasonr@gnu.org>
date Tue, 22 May 2007 15:14:56 +0000
parents e9b063d17531
children 9355f9b7bbff 738ce3540ffb 91bf6e05918b
comparison
equal deleted inserted replaced
77781:909ffe62fdd8 77782:bde249020282