view etc/images/tree-widget/folder/end-guide.png @ 93983:955774916817

(smerge-apply-resolution-patch): Fix typo. (smerge-resolve): Merge the "2-way refinement" case with one half of the "mere whitespace" resolution.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 11 Apr 2008 01:10:43 +0000
parents 8c56061ac822
children
line wrap: on
line source

(binary:image/png)