@lists.secondlife.com
Subject: [opensource-dev] recent viewer-development changes
I normally hg pull into a local base viewer-development repo and then cd into
my work repo, hg fetch from base and it usually handles my local changes with a
default merge cleanly.
This last weeks changes did not cleanly
I normally hg pull into a local base viewer-development repo and then cd into
my work repo, hg fetch from base and it usually handles my local changes with a
default merge cleanly.
This last weeks changes did not cleanly merge with about 8-10 files requiring a
run through kdiff3 merge tool. The
