Issue 2138: whatsnew --summary does not report conflict marker

Title	whatsnew --summary does not report conflict marker
Priority		Status	unknown
Milestone		Resolved in
Superseder		Nosy List	lelegaifax
Assigned To		Topics

Created on 2012-02-03.21:26:26 by lelegaifax, last changed 2012-02-12.09:59:03 by lelegaifax.

Messages
msg15087 (view)	Author: lelegaifax	Date: 2012-02-03.21:26:24
Accordingly to the "darcs whatsnew --help" documentation when two patches produce a conflict the summary should report that with a "!", but it does not as of darcs 2.5.2. $ darcs wha hunk ./f 2 +v v v v v v v +============= +Conflict on side R +************* +Conflict on side S +^ ^ ^ ^ ^ ^ ^ $ darcs wha -s M ./f +6 I'll send a test script as soon as I have the issue number back. Thanks&bye, lele.
msg15110 (view)	Author: lelegaifax	Date: 2012-02-12.09:59:02
On Fri, 03 Feb 2012 21:26:26 +0000 Lele Gaifax <bugs@darcs.net> wrote: > Accordingly to the "darcs whatsnew --help" documentation when two > patches produce a conflict the summary should report that with a "!", > but it does not as of darcs 2.5.2. FWIW, neither does darcs 2.3.1...

Issue 2138 whatsnew --summary does not report conflict marker