Mercurial > hg
view tests/test-merge4.out @ 11893:aa50d07208d2
Merge with stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 15 Aug 2010 18:50:19 +0200 |
parents | 4b0c9c674707 |
children |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)