Mercurial > hg

diff tests/test-diff-color.t @ 39267:88c5a3ef54b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: avoid putting translated text into docstring This is follow up of my mistake in e09fad982ef5. There is no merge tool, which has only one of binary or symlink capabilities, but this patch lists up all combinations of them for safety in the future. Maybe, it is too paranoid, though.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Wed, 22 Aug 2018 14:08:27 +0900
parents ddc1da134772
children c8e371ee65a4
line wrap: on
line diff