Mercurial > hg
view tests/test-merge4.out @ 2743:a31f0f2997e9
import: switch from application/x-patch to text/x-diff
christian ebert says his mailer was broken.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Mon, 31 Jul 2006 12:02:13 -0700 |
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)