Mercurial > hg
view tests/test-merge2.out @ 6467:65029a3aafc2
Let --unified default to diff.unified (issue 1076)
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 04 Apr 2008 22:15:14 +0200 |
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