diff --git a/zshrc b/zshrc index 9e0f962..b25cfd0 100755 --- a/zshrc +++ b/zshrc @@ -238,7 +238,7 @@ if command_exists git; then alias dc='git diff --cached' alias dmcr='git diff-merge-conflict-resolution' alias ds='git diff --stat' - alias ecf='git edit-conflicted-files mate' + alias ecf='git edit-conflicted-files' alias f='git fetch' # Don't clobber the new GitHub CLI if ! command_exists gh; then