Merged refactor

Added missing status UPDATED_BY_MERGE 
Fixed parsing of file status

FossilOrigin-Name: f82fab41453e6ccf28c60e89ce567635ffab25a3
This commit is contained in:
kostas
2015-04-30 17:43:40 +00:00
7 changed files with 131 additions and 125 deletions

View File

@@ -1 +1 @@
e54f1cacad13f429891d89053a208cd340386a3b
f82fab41453e6ccf28c60e89ce567635ffab25a3