Add Resolve "Their" and Resolve "Mine" at conflict item.
tree62d8394b6742ba732d313aaa2db27af0fbba9667
-rw-r--r-- 336 .gitignore
-rw-r--r-- 261 .gitmodules
drwxr-xr-x - Languages
-rw-r--r-- 3557 build.txt
drwxr-xr-x - common
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
drwxr-xr-x - src