---------------------------------------------------------------------
C:\Programs\The Amoeba Project>hg --config http_proxy.host=127.0.0.1:8118 pull http://xvpw5dpz3pqznyhe.onion/hg/amoeba
pulling from http://xvpw5dpz3pqznyhe.onion/hg/amoeba
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 65 changes to 65 files
(run 'hg update' to get a working copy)
C:\Programs\The Amoeba Project>hg update
merging Amoeba.Collections.Generic/Properties/AssemblyInfo.cs
warning: conflicts during merge.
merging Amoeba.Collections.Generic/Properties/AssemblyInfo.cs failed!
merging Amoeba.Net.Connection/Properties/AssemblyInfo.cs
warning: conflicts during merge.
merging Amoeba.Net.Connection/Properties/AssemblyInfo.cs failed!
merging Amoeba.Net.PeerToPeer.Kademlia/Properties/AssemblyInfo.cs
warning: conflicts during merge.
merging Amoeba.Net.PeerToPeer.Kademlia/Properties/AssemblyInfo.cs failed!
merging Amoeba.Net.PeerToPeer.Sharing/Properties/AssemblyInfo.cs
warning: conflicts during merge.
merging Amoeba.Net.PeerToPeer.Sharing/Properties/AssemblyInfo.cs failed!
merging Amoeba.Windows/Amoeba.Windows.csproj
merging Amoeba.Windows/Properties/AssemblyInfo.cs
warning: conflicts during merge.
merging Amoeba.Windows/Properties/AssemblyInfo.cs failed!
merging Amoeba/Properties/AssemblyInfo.cs
warning: conflicts during merge.
merging Amoeba/Properties/AssemblyInfo.cs failed!
58 files updated, 1 files merged, 2 files removed, 6 files unresolved
use 'hg resolve' to retry unresolved file merges
C:\Programs\The Amoeba Project>hg resolve --all
merging Amoeba.Collections.Generic/Properties/AssemblyInfo.cs
warning: conflicts during merge.
merging Amoeba.Collections.Generic/Properties/AssemblyInfo.cs failed!
merging Amoeba.Net.Connection/Properties/AssemblyInfo.cs
warning: conflicts during merge.
merging Amoeba.Net.Connection/Properties/AssemblyInfo.cs failed!
merging Amoeba.Net.PeerToPeer.Kademlia/Properties/AssemblyInfo.cs
warning: conflicts during merge.
merging Amoeba.Net.PeerToPeer.Kademlia/Properties/AssemblyInfo.cs failed!
merging Amoeba.Net.PeerToPeer.Sharing/Properties/AssemblyInfo.cs
warning: conflicts during merge.
merging Amoeba.Net.PeerToPeer.Sharing/Properties/AssemblyInfo.cs failed!
merging Amoeba.Windows/Properties/AssemblyInfo.cs
warning: conflicts during merge.
merging Amoeba.Windows/Properties/AssemblyInfo.cs failed!
merging Amoeba/Properties/AssemblyInfo.cs
warning: conflicts during merge.
merging Amoeba/Properties/AssemblyInfo.cs failed!