On 30 May 2010, at 09:17, Trent W. Buck wrote:

Dan Pascu <d...@ag-projects.com> writes:

[issue1187] Darcs simply provides an empty file for one of the
versions to the external merge tool

IIRC that happens when there's a mv; darcs diff and external merge don't
handle that case.  I don't have an external merge tool available right
now, so I can't easily check :-(

Whatever happens, it used to work just fine in 2.3. This was broken by 2.4. And darcs diff is not involved in this (at least not me explicitly typing that command). All I do is darcs pull

--
Dan






_______________________________________________
darcs-users mailing list
darcs-users@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-users

Reply via email to