[darcs-users] Re: bug report
Mark Stosberg
mark at summersault.com
Fri Oct 29 16:44:00 UTC 2004
On 2004-10-29, David Roundy <droundy at abridgegame.org> wrote:
>
> Can also find out what the conflict was by running darcs whatsnew after the
> resolve, since that will show the conflict resolution/marking.
Could an option to be added to "--summary" to show the conflicting files
as well? CVS does this and it's nice. I just confirmed that whatsnew
doesn't do this with 1.0.0rc3:
$ darcs whatsnew
{
hunk ./date_move.t 1
-Sat Oct 23 21:10:38 EST 2004
-3ord.
-4 changed!
-changed again!
+v v v v v v v
+changing all for lines.
+*************
+conflict!
+^ ^ ^ ^ ^ ^ ^
}
##################
$ darcs whatsnew --summary
M ./date_move.t -4 +5
More information about the darcs-users
mailing list