Added 'Auto-accept upstream conflict" option

Auto-accept upstream conflict - automatically except the upstream
conflict (mine-conflict when on the upstream branch for merge), defaults
to false (No automatic conflict resolution.)