Mercurial > hg

view hgext/__init__.py @ 21865:78e56e70c70a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: use 'util.ellipsis' to trim custom conflict markers correctly Before this patch, filemerge slices byte sequence directly to trim conflict markers, but this may cause: - splitting at intermediate multi-byte sequence - incorrect calculation of column width (length of byte sequence is different from columns in display in many cases) This patch uses 'util.ellipsis' to trim custom conflict markers correctly, even if multi-byte characters are used in them.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sun, 06 Jul 2014 02:56:41 +0900
parents 7d439981bec4
children 155e3308289c
line wrap: on
line source

# placeholder