log

age author description
Fri, 14 Jan 2011 13:10:15 -0500 Stefan Monnier * lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.