newbie question on hg update

[marwie]

Nope, no conflict. Just the output I posted:

merging test.txt
0 files updated, 1 files merged, 0 files removed, 0 files unresolved


Lasse Vågsæther Karlsen wrote:
> 
> On Thu, May 12, 2011 at 20:59, marwie <marwie at gmx.de> wrote:
> 
> Did you get a merge conflict when you updated, or did it update cleanly?
> 
> --
> Lasse Vågsæther Karlsen
> 
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
> 


--
View this message in context: http://mercurial.808500.n3.nabble.com/newbie-question-on-hg-update-tp2933068p2933194.html
Sent from the General mailing list archive at Nabble.com.