4 ms·You can actually run smerge mergetool LEFT RIGHT and it will do a 2-way merge (effectively a diff).by djohnston92 6y agoYou can actually run smerge mergetool LEFT RIGHT and it will do a 2-way merge (effectively a diff).