Skip to content

Instantly share code, notes, and snippets.

@henri

henri/smerge_cheatsheet.txt

Last active January 31, 2024 03:20
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save henri/a856a916ed093e97f2a8abf883069005 to your computer and use it in GitHub Desktop.
Save henri/a856a916ed093e97f2a8abf883069005 to your computer and use it in GitHub Desktop.
Download ZIP
sublime merge cheat sheet
Raw
smerge_cheatsheet.txt
# visual diff using smerge
smerge mergetool file1 file2
# fish open files with wildcard name substiution
smerge mergetool (ls *-myfiles.txt | string split " ")
# bash open files with wildcard name substiution
smerge mergetool $(ls *-myfiles.txt)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment