| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
| Wed, 15 Feb 2006 22:21:20 +0100 | |
| changeset 1724 | 5a36609f73a7 |
| parent 1637 | 3b1b44b917f4 |
| child 1933 | 7544700fd931 |
| permissions | -rw-r--r-- |
1:f4d7a8c73d23 0:232e179b3f29 f4d7a8c73d23 tip 232e179b3f29 232e179b3f29+ 232e179b3f29 f4d7a8c73d23 tip merge: warning: conflicts during merge merging file1 merging file1 failed! diff -r f4d7a8c73d23 file1 --- a/file1 +++ b/file1 @@ -1,3 +1,7 @@ added file1 added file1 another line of text +<<<<<<< +changed file1 different +======= changed file1 +>>>>>>> M file1 f4d7a8c73d23+ tip f4d7a8c73d23 tip f4d7a8c73d23 tip f4d7a8c73d23 tip