diff i18n/hggettext @ 17885:9a2cf955db84 stable

filemerge: use util.shellquote when calling merge (issue3581)
author Keegan Carruthers-Smith <keegancsmith@fb.com>
date Fri, 26 Oct 2012 12:02:58 -0700
parents 80deae3bc5ea
children 2516bba643e7
line wrap: on
line diff