author | Gregory Szorc <gregory.szorc@gmail.com> |
Wed, 25 Apr 2018 14:51:20 -0700 | |
branch | stable |
changeset 37822 | da07c781aba9 |
parent 22023 | f18830651811 |
permissions | -rw-r--r-- |
22023
f18830651811
simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
4363
diff
changeset
|
1 |
................ |
4363
2e3c54fb79a3
actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
2 |
---------------------------------------------------------------------- |
22023
f18830651811
simplemerge: burn "minimal" feature to the ground
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
4363
diff
changeset
|
3 |
Ran 16 tests in 0.000s |
4363
2e3c54fb79a3
actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
4 |
|
2e3c54fb79a3
actually port simplemerge to hg
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
5 |
OK |