Re: [Monotone-devel] automate show_conflict

[Thomas Keller]

Stephen Leake schrieb:
> This is now complete; 'mtn automate show_conflicts' outputs basic_io
> for all conflict cases.
>
> So I think the branch n.v.m.automate_show_conflict is ready to be
> merged to main. Someone may want to review it first. And I have to
> review the automate version number; there's been a release since I
> checked it.

The diff of nvm against nvm.automate_show_conflict is quite huge 
(>25.000 lines). It seems that nvm.automate_show_conflict doesn't 
contain all the recent changes in nvm. Could you therefor please 
propagate from nvm to your branch first and resubmit your request?

Thanks,
Thomas.

--
GPG-Key 0x160D1092 | address@hidden | http://thomaskeller.biz
Please note that according to the EU law on data retention, information
on every electronic information exchange might be retained for a period
of six months or longer: http://www.vorratsdatenspeicherung.de/?lang=en

signature.asc
Description: OpenPGP digital signature