Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-conflict.out @ 2331:953dbfb2824c
diff: allow to use -rA:B syntax as well as -rA -rB
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sun, 21 May 2006 23:07:19 -0700 |
parents | b2ae81a7df29 |
children | 46280c004f22 |
comparison
equal
deleted
inserted
replaced
2330:b30aa02c85e7 | 2331:953dbfb2824c |
---|