diff contrib/hgk @ 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 22f948c027a9
children 0f93bbe8deb7
line wrap: on
line diff