files added
local files modified
Merge /tmp/git_test