Overview
| SHA1 Hash: | e45d478f0c37add20a1dad418706b42745b1911e |
|---|---|
| Date: | 2009-03-20 01:23:53 |
| User: | drh |
| Comment: | Improve merge conflict markings. |
| Timelines: | ancestors | descendants | both | trunk |
| Other Links: | files | ZIP archive | manifest |
Tags And Properties
- branch=trunk inherited from [a28c83647d]
- sym-trunk inherited from [a28c83647d]
Changes
[show diffs]Modified src/merge3.c from [e01dd37d11] to [b978e84c95]. [diff]