Mercurial > hg
view tests/test-merge-revert2.out @ 1953:379ab45b91b7
change default strftime format for better portability
On some systems, such as Solaris and HP-UX, "%c" format
give output without the leading zero on the single-digit
month-day.
| author | TK Soh <teekaysoh@yahoo.com> |
|---|---|
| date | Tue, 14 Mar 2006 22:01:30 -0800 |
| parents | 7544700fd931 |
| children | d436b21b20dc |
line wrap: on
line source
1:f248da0d4c3e 0:9eca13a34789 f248da0d4c3e tip 9eca13a34789 9eca13a34789+ 9eca13a34789 f248da0d4c3e tip merge: warning: conflicts during merge merging file1 merging file1 failed! diff -r f248da0d4c3e file1 --- a/file1 +++ b/file1 @@ -1,3 +1,7 @@ added file1 added file1 another line of text +<<<<<<< +changed file1 different +======= changed file1 +>>>>>>> M file1 f248da0d4c3e+ tip f248da0d4c3e tip f248da0d4c3e tip f248da0d4c3e tip