On Sun, Jul 6, 2008 at 7:29 PM, Pietro Gagliardi <[EMAIL PROTECTED]> wrote:
> Sorry, but I got screwed by that too. -s only works if there is a conflict.
> You'll have to manually copy it from /n/sources/plan9/. Type
>
>        9fs sources
>        cp /n/sources/plan9/rc/bin/termc /rc/bin/termrc

There is no conflict. I copied it as you wrote. After that I had local
termrc with different time compared to termrc in sources. I did pull -
and no changes, no conflicts. I don't understand. I expected conflict
because of different modification time.

Antonin

Reply via email to