(vc-cvs-parse-entry): Make sure a file with conflicts
[emacs.git] / etc / emacs.xbm
blob05a0e6f12f2aa5efb0578a13c34219bdedc694d2
etc/emacs.xbm