Mercurial > hg-stable
view tests/test-merge2.out @ 11480:57afaabc87c5 stable
merge with stable
author | Wagner Bruna <wbruna@softwareexpress.com.br> |
---|---|
date | Tue, 29 Jun 2010 12:18:42 -0300 |
parents | 4b0c9c674707 |
children |
line wrap: on
line source
0 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head 0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b created new head 0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b created new head