show diff but not merge
merge local with origin