tests/test-status-inprocess.py.out
author Matt Mackall <mpm@selenic.com>
Sat, 05 Mar 2011 16:34:59 -0600
changeset 13536 fac040b7e822
parent 10838 07dbafd3a0e2
permissions -rw-r--r--
merge: drop resolve state for mergers with identical contents (issue2680)

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