Mercurial > hg
view tests/test-merge4.out @ 6069:212bfb5c50e1
keyword: avoid os import by using util.splitpath
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Sat, 09 Feb 2008 22:37:51 +0100 |
parents | b2ae81a7df29 |
children | 4b0c9c674707 |
line wrap: on
line source
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)