Mercurial > hg
diff tests/test-merge8.out @ 5587:121f9dbcc236
update test output
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 02 Dec 2007 16:26:56 -0600 |
parents | bb1800a7d7e1 |
children | 0750f11152fe |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 02 Dec 2007 16:26:56 -0600 |
parents | bb1800a7d7e1 |
children | 0750f11152fe |