view tests/test-issue612.out @ 7117:ceb8aef03aa7

Document email.charsets in hgrc.5 hgrc.5.ja.txt probably should include an example like: [email] charsets = iso-8859-1, iso-8859-15, windows-1252, iso-8859-2, windows-1250, iso-2022-jp, iso-2022-jp-ms
author Christian Ebert <blacktrash@gmx.net>
date Thu, 16 Oct 2008 17:08:46 +0200
parents 368a4ec603cc
children
line wrap: on
line source

adding src/a.c
moving src/a.c to source/a.c
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
? src/a.o
merging src/a.c and source/a.c to source/a.c
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M source/a.c
R src/a.c
? source/a.o