##// END OF EJS Templates
rebase: don't preserve most extra fields...
rebase: don't preserve most extra fields This backs out changeset 88fde8db5307. See the previous patches for why.

File last commit:

r22023:f1883065 default
r27977:b698abf9 3.7.1 stable
Show More
test-simplemerge.py.out
5 lines | 115 B | text/plain | TextLexer
/ tests / test-simplemerge.py.out
Pierre-Yves David
simplemerge: burn "minimal" feature to the ground...
r22023 ................
Alexis S. L. Carvalho
actually port simplemerge to hg...
r4363 ----------------------------------------------------------------------
Pierre-Yves David
simplemerge: burn "minimal" feature to the ground...
r22023 Ran 16 tests in 0.000s
Alexis S. L. Carvalho
actually port simplemerge to hg...
r4363
OK