view en/examples/tour.update.out @ 199:58e3a6c76725

More branch/merge stuff.

$ \textbf{grep printf hello.c}
	printf("hello, world!\textbackslash{}");
$ \textbf{hg update tip}
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ \textbf{grep printf hello.c}
	printf("hello, world!\textbackslash{}");
	printf("hello again!\textbackslash{}n");