Change 276
C4 - small bug fixed; updated to version 1.6
* We are now a little more intelligent about what happens if
there is a merge conflict between the local client and the
head of the tree, and also about trying to do a refresh and
a sync on the same file.
* We are now a little more intelligent about what happens if
there is a merge conflict between the local client and the
head of the tree, and also about trying to do a refresh and
a sync on the same file.
Tip: Use n and p to cycle through the changes.