##// END OF EJS Templates
tests: fix 05210e955bef merge error in test-git-import.t
tests: fix 05210e955bef merge error in test-git-import.t

File last commit:

r10838:07dbafd3 stable
r12586:b96de59a default
Show More
test-status-inprocess.py.out
5 lines | 62 B | text/plain | TextLexer
/ tests / test-status-inprocess.py.out
% creating repo
% add and commit
C test.py
% change
M test.py