# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1276206797 14400
# Node ID 7ee2661d5bd84bb9f70dc1472a8c863bcc672f2d
# Parent  309b770e8a8d4bf269a5a0aa546c194f97f21a97# Parent  181d0ea03b770b7e24eb8a74e33ae1bd8eb7b038
Merge.

diff -r 181d0ea03b77 -r 7ee2661d5bd8 .gitconfig
--- a/.gitconfig	Thu Jun 10 16:50:47 2010 -0400
+++ b/.gitconfig	Thu Jun 10 17:53:17 2010 -0400
@@ -4,7 +4,7 @@
 
 [core]
 pager = cat
-editor = mate -w
+editor = vim
 
 [alias]
 gl = log -10 --all --graph --topo-order --pretty='format: %Cgreen%h%Creset %s%Cred%d%Creset%n'