comparison etc/charsets/JISX2131.map @ 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 206129f9e4ce
children 8cc2b1e9767f
comparison
equal deleted inserted replaced
93982:ec7aefc66165 93983:955774916817