Mercurial > hg
diff tests/test-conflict @ 2852:474adc2bc5f7
fix test output
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 10 Aug 2006 17:37:57 -0700 |
parents | e506c14382fd |
children | 46280c004f22 |
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Thu, 10 Aug 2006 17:37:57 -0700 |
parents | e506c14382fd |
children | 46280c004f22 |