viewer-development was moved to a new folder and a new viewer-development repo
was recreated with a different set of changes in it that differs from the old
one. This is why you got merge conflicts.~TM
Date: Thu, 31 May 2012 19:31:49 -0700
From: nickyper...@yahoo.com
To: opensource-dev@lists.se
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
---
This is an automatically generated e-mail. To reply, visit:
http://codereview.secondlife.com/r/556/
---
(Updated May 31, 2012, 4:03 a.m.)
Review request for Viewer.
Changes
