comparison mercurial/helptext/hg.1.txt @ 44948:eb6380da47a5

simplemerge: leverage pycompat function to convert byte string to set
author Yuya Nishihara <yuya@tcha.org>
date Tue, 02 Jun 2020 21:40:49 +0900
parents 0ab651b5f77c
children ed43b6fa847e
comparison
equal deleted inserted replaced
44947:ad6971e6740c 44948:eb6380da47a5