git config --global http.proxy http://www-proxy.us.oracle.com:80
git config --global https.proxy http://www-proxy.us.oracle.com:80
some code here
hello from local
second local change
local change
change in local
<<<<<<< HEAD
change to conflict from local
change to conflict from remote
origin/master some change
git config --global --add diff.tool kdiff3
git config --global --add diff.guitool kdiff3
git config --global --add difftool.kdiff3.path "C:\Program Files\KDiff3\kdiff3.exe"
git config --global --add difftool.kdiff3.trustExitCode false