Overview
| SHA1 Hash: | ba9af9acedf935cb086faa22dcfac54d4dd5ba88 |
|---|---|
| Date: | 2007-11-29 00:37:41 |
| User: | drh |
| Comment: | Fix the merge conflict detection. |
| 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 [b966dfba2b] to [e01dd37d11]. [diff]