Update the merge script to support git.
Add the commit command which commits changes locally.