git: push.default = current, merge.conflictstyle = diff3

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>