--- a/.hgrc
+++ b/.hgrc
@@ -4,6 +4,7 @@ merge = vimdiff
 
 [extensions]
 hgext.graphlog = 
+mq = 
 rebase = 
 color = 
 record = 
@@ -21,6 +22,7 @@ fetch = pull --rebase
 [merge-tools]
 vimdiff.executable = vim
 vimdiff.args = -d $base $local $output $other +close +close
+vimdiff.check = changed, conflicts
 
 
 %include ~/.hgrc.local