annotate msdos/emacs.ico @ 65658:5bde6d4759d6

(smerge-remove-props): Cause re-highlighting of the whole conflict.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 23 Sep 2005 18:15:20 +0000
parents 354e0c45cedf
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25856
Dave Love <fx@gnu.org>
parents:
diff changeset
1 (binary:image/vnd.microsoft.icon)