# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1276120428 14400
# Node ID 309b770e8a8d4bf269a5a0aa546c194f97f21a97
# Parent  1b7aa8ec75fb5a6743de4459b6079f3699a52c8a# Parent  24c78d478e3664db84a4091945932c6b10834daa
Merge.

diff -r 24c78d478e36 -r 309b770e8a8d .gitconfig
--- a/.gitconfig	Wed Jun 09 17:00:10 2010 -0400
+++ b/.gitconfig	Wed Jun 09 17:53:48 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'