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

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 4fe8d1f077b8
children 5abc47d4ca6b
line wrap: on
line diff