mirror of
https://github.com/robbyrussell/oh-my-zsh.git
synced 2026-09-29 22:46:06 +02:00
Sublime Merge plugin: Add an smerge alias to complement the similar alias in the Sublime Text plugin (#13930)
This commit is contained in:
@@ -19,6 +19,7 @@
|
|||||||
ssm_run_sudo() {sudo $_sublime_merge_path "$@" >/dev/null 2>&1}
|
ssm_run_sudo() {sudo $_sublime_merge_path "$@" >/dev/null 2>&1}
|
||||||
alias ssm=ssm_run_sudo
|
alias ssm=ssm_run_sudo
|
||||||
alias sm=sm_run
|
alias sm=sm_run
|
||||||
|
alias smerge="'$_sublime_merge_path'"
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -33,6 +34,7 @@
|
|||||||
if [[ -a $_sublime_merge_path ]]; then
|
if [[ -a $_sublime_merge_path ]]; then
|
||||||
subm () { "$_sublime_merge_path" "$@" }
|
subm () { "$_sublime_merge_path" "$@" }
|
||||||
alias sm=subm
|
alias sm=subm
|
||||||
|
alias smerge="'$_sublime_merge_path'"
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -45,6 +47,7 @@
|
|||||||
if [[ -a $_sublime_merge_path ]]; then
|
if [[ -a $_sublime_merge_path ]]; then
|
||||||
subm () { "$_sublime_merge_path" "$@" }
|
subm () { "$_sublime_merge_path" "$@" }
|
||||||
alias sm=subm
|
alias sm=subm
|
||||||
|
alias smerge="'$_sublime_merge_path'"
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|||||||
Reference in New Issue
Block a user