Overview
| Artifact ID: | db5f0db2c8e94aa3f8214fde8e1b75e9a18c3359 |
|---|---|
| Ticket: | 9bf1f9d502f6a5e409c2fb7e3df9a7ce67b8b3c7
Misleading summary of merge troubles at the end of merge |
| User & Date: | viriketo 2011-05-02 08:38:55 |
Changes
- Appended to comment:
<hr /><i>viriketo added on 2011-05-02 08:38:55 UTC:</i><br /> And as a question apart, how could I set the common ancestor for the files? I can make the *equal* at some point, but I can't think of a way of making them come from a common ancestor.
- resolution changed to: "Open"