mercurial-crew-with-dirclash: tests/test-conflict.out@1f3710636b45 (annotated)

[PATCH] Print timezone offset when outputting dates Example: % hg log | head -12 changeset: 791:41440890e57d2dbacde03a2a114e5114a031ea4a tag: tip user: Samuel Tardieu <sam@rfc1149.net> date: Mon Jul 25 13:24:15 2005 +0200 summary: Parse various date formats when accepting user specified dates [...] changeset: 787:ba5c2021364ee876dae170e8f153e43bd0b2bd73 parent: 785:31a80e3723cee0a5991340facb2707e71983eb41 user: Bryan O'Sullivan <bos@serpentine.com> date: Sun Jul 24 00:39:24 2005 -0800 summary: Get "forget" command to use new walk code. [...]

346 f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: diff changeset	1	merge: warning: conflicts during merge
f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: diff changeset	2	merging a
f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: diff changeset	3	merging a failed!
374 f07d00fcd281 update tests to reflect new short hash length mpm@selenic.com parents: 346 diff changeset	4	32e80765d7fe+75234512624c+ tip
346 f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: diff changeset	5	something else
f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: diff changeset	6	=======
f69a5d2d4fe1 merge3: fix argument order mpm@selenic.com parents: diff changeset	7	something
748 c5df1a9c5276 Update test output for status change mpm@selenic.com parents: 591 diff changeset	8	M a

author	Samuel Tardieu <sam@rfc1149.net>
	Fri, 19 Aug 2005 23:23:42 -0800
changeset 967	1f3710636b45
parent 925	5a034646e472
child 1933	7544700fd931
permissions	-rw-r--r--