Re: info files

[Stephen Berman]

On Mon, 23 Dec 2013 18:10:53 +0100 Andreas Schwab <address@hidden> wrote:

> Stephen Berman <address@hidden> writes:
>
>> So I suppose the next time I update the branch I'll get a conflict
>> again
>
> No, you won't.  It's now an ignored directory.

Ah, ok; thanks.  (I guess it would have been more polite to just wait
till I could update again, then I would have seen no conflict, but
thanks for indulging my impatience.)

Steve Berman