tree 31e3692833e0e98429c44f6af68527824912d74c
parent ee7e613a13332dea614de38f38d80a63c79257d8
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1357282012 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1357282012 -0800

The current view of FileState is now fully maintained, including handling of "conflict resolution"