view tests/test-status-inprocess.py.out @ 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 07dbafd3a0e2
children
line wrap: on
line source

% creating repo
% add and commit
C test.py
% change
M test.py