added 'conflict' status and fixed status detection for context menu
tree9ecb6b3af6a6ef6e1b1e2e66cb719ae909b18a7e
-rw-r--r-- 92 .gitignore
-rw-r--r-- 3557 build.txt
drwxr-xr-x - common
drwxr-xr-x - contrib
drwxr-xr-x - ext
drwxr-xr-x - src