Mercurial > hg
view tests/test-ui-color.py.out @ 23024:ec36969497de
resolve: run happily after conflict-free merge
author | Martin von Zweigbergk <martinvonz@gmail.com> |
---|---|
date | Wed, 08 Oct 2014 22:30:04 -0700 |
parents | 842a9179132c |
children | b8c2004a8d2b |