Sublime Merge is fucking amazing
@matrix vim -d file1 file2
@applejack
Vim is too complicated for my double digit IQ zoomer brain.
Btw this is merging so that command probably wouldn't achieve the same thing Sublime Merge does.
@matrix Merging with this means editing conflicts and then committing.
@LukeAlmighty @matrix I don't like spaces instead of tabs either, but this isn't my project