view nt/icons/gnu6w48.ico @ 94884:4ea0e968c7af

(smerge-apply-resolution-patch): Don't pass nil to `insert'.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 12 May 2008 18:21:24 +0000
parents 354e0c45cedf
children
line wrap: on
line source

(binary:image/vnd.microsoft.icon)