Mercurial > hgbook
view en/examples/tour.diff.out @ 156:91a936be78b8
Document merge behaviour with file names.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 12 Mar 2007 23:11:26 -0700 |
parents | 006bbad1f190 |
children | 1b52bda675d0 |
line wrap: on
line source
$ \textbf{hg diff} diff -r hello.c @@ -8,5 +8,6 @@ int main(int argc, char **argv) int main(int argc, char **argv) \{ printf("hello, world!\textbackslash{}"); + printf("hello again!\textbackslash{}n"); return 0; \}