SHA1 Hash:	16e308106f96879f9ac2812e592d8596aa9392a6
Date:	2008-08-14 05:27:43
User:	bharder
Comment:	Third time lucky? Commit changes, with merge applied only once. (so not filled with MERGE CONFLICT messages)
Timelines:	ancestors | descendants | both | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-trunk inherited from [a28c83647d]

Modified src/checkin.c from [ede786a568] to [425f4bbcea].    [diff]