Mercurial > hg

comparison tests/test-ancestor.py.out @ 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 3b1b8f25443e
children b6db2e80a9ce
comparison
equal deleted inserted replaced
39266:82555d7186d0 39267:88c5a3ef54b1