Hey, I’d like to use Sublime Merge for merging old config files with new ones when updating my Arch Linux system. Seems like it might be a bit nicer than vimdiff. Only problem is it is asking for repos. Is there any means of diffing and merging files in regular directories?
Any means of using Sublime Merge for merging files not in repos?
djohnston
#2
Hi @zerophase,
Thanks for the question!
Sublime Merge doesn’t currently have have a command-line diff tool, though it does have a 3-way merge tool. This can be run via the command line tool smerge.
It supports 2-way and 3-way merges with the following parameters:
smerge mergetool [--no-wait] [base] left right [-o merged]
It’s worth noting that the merge tool is designed to work with individual files (as opposed to directories).
Hope this helps!
- Dylan
2 Likes
zerophase
#3
@djohnston Found another post on the same issue after posting this. I like it so far. I might switch from GitKraken eventually.
0 Likes