1 files changed, 1 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 2d8bbd0..9eeac27 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,6 +16,7 @@
 	b = branch -vv
 	sup = log --all --graph --pretty=format:'%Cblue%h%C(yellow)%d %Creset%s %Cgreen(%cr) %Cred%an%+b'
 	sp = show --stat -p
+	mff = merge
 [merge]
 	tool = vimdiff
 [push]