view tests/test-merge-revert.out @ 2103:caccf539c9a4

Use application/octet-stream as the content-type of unknown binary files
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Thu, 20 Apr 2006 15:42:02 +0200
parents c9226bcc288d
children b2ae81a7df29
line wrap: on
line source

1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
eb43f19ff115
eb43f19ff115+
reverting file1
? file1.orig
eb43f19ff115
? file1.orig
016807e6fdaf tip
merging file1
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip