| 2006-03-14 21:51:19 |
Sami Haahtinen |
bug |
|
|
added bug |
| 2006-03-14 21:53:02 |
Sami Haahtinen |
bug |
|
|
added attachment 'bzrlog.txt' (Log of an example case) |
| 2006-04-24 02:41:17 |
Martin Pool |
bzr: status |
Unconfirmed |
Confirmed |
|
| 2006-04-24 02:41:17 |
Martin Pool |
bzr: statusexplanation |
|
Confirmed; agree that more information on the conflict would help.
Ideally we would also note a file-id join to allow better future merges. |
|
| 2011-02-01 14:38:06 |
Jelmer Vernooij |
tags |
|
conflicts ui |
|
| 2011-06-14 07:57:07 |
Max Bowsher |
removed subscriber Bazaar Developers |
|
|
|
| 2017-11-08 22:55:59 |
Jelmer Vernooij |
tags |
conflicts ui |
check-for-breezy conflicts ui |
|
| 2018-09-23 01:10:29 |
Jelmer Vernooij |
tags |
check-for-breezy conflicts ui |
conflicts ui |
|
