Mercurial > hg
diff mercurial/pvec.py @ 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 | e7cfe3587ea4 |
children | 5093d2a87ff6 |