Category: merge 2015 Git - Review a Merge before committing Jun 24 2015 2014 OS-X : Using DiffMerge as your Git visual merge and diff tool Feb 19 2014
