Mercurial > hg
comparison mercurial/simplemerge.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 | e34106fa0dc3 |
| children | 4aeb7a6029ba |
comparison
equal
deleted
inserted
replaced
| 17884:0188ddfa844e | 17885:9a2cf955db84 |
|---|