# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1263425355 18000
# Node ID 377ad9ef79310959d7f74911ea1c754bca128c72
# Parent  97bf431de3e66df86b232e5da6615881449a7853
More changes.

diff -r 97bf431de3e6 -r 377ad9ef7931 .hgrc
--- a/.hgrc	Sun Jan 10 18:01:10 2010 -0500
+++ b/.hgrc	Wed Jan 13 18:29:15 2010 -0500
@@ -35,13 +35,13 @@
 [extdiff]
 cmd.fmdiff = fmdiff
 
-[merge-patterns]
-** = filemerge
+#[merge-patterns]
+#** = filemerge
 
-[merge-tools]
-filemerge.executable = /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
-filemerge.args = -left $other -right $local -ancestor $base -merge $output
-filemerge.gui = True
+#[merge-tools]
+#filemerge.executable = /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
+#filemerge.args = -left $other -right $local -ancestor $base -merge $output
+#filemerge.gui = True
 
 [email]
 method = smtp
@@ -91,6 +91,10 @@
 st = status -C
 ? = summary
 
+#mlocal = merge --config 'ui.merge=internal:local'
+#mother = merge --config 'ui.merge=internal:other'
+#mfail = merge --config 'ui.merge=internal:fail'
+
 slog = log --style=/Users/sjl/lib/dotfiles/mercurial/cli-templates/map-cmdline.slog
 . = slog -l15
 .. = . -l100000000
@@ -100,4 +104,4 @@
 
 nlog = log --style=/Users/sjl/lib/dotfiles/mercurial/cli-templates/map-cmdline.nlog
 n = nlog -vr
-show = nlog -vpr
\ No newline at end of file
+show = nlog -vpr
diff -r 97bf431de3e6 -r 377ad9ef7931 .zshrc
--- a/.zshrc	Sun Jan 10 18:01:10 2010 -0500
+++ b/.zshrc	Wed Jan 13 18:29:15 2010 -0500
@@ -19,6 +19,7 @@
 alias meme="curl -q --silent meme.boxofjunk.ws/moar.txt?lines=1"
 alias deact='deactivate'
 alias serve_this='python -m SimpleHTTPServer'
+alias oldgcc='export CC=/usr/bin/gcc-4.0'
 
 # Environment variables ------------------------------------------------------
 export EDITOR='vim'
diff -r 97bf431de3e6 -r 377ad9ef7931 mercurial/cli-templates/map-cmdline.sglog
--- a/mercurial/cli-templates/map-cmdline.sglog	Sun Jan 10 18:01:10 2010 -0500
+++ b/mercurial/cli-templates/map-cmdline.sglog	Wed Jan 13 18:29:15 2010 -0500
@@ -1,6 +1,6 @@
 changeset = '\033[0;33m{rev}\033[0m {desc|firstline|strip}{branches}{tags}\n\n'
 
-changeset_verbose = '\033[0;33m{rev}\033[0m {desc|firstline|strip}{branches}{tags}\n\033[1;30m({date|age} by {author|person})\033[0m\n\n'
+changeset_verbose = '\033[0;33m{rev}\033[0m:\033[0;33m{node|short}\033[0m {desc|firstline|strip}{branches}{tags}\n\033[1;30m({date|age} by {author|person})\033[0m\n\n'
 
 start_branches = ' '
 branch = '\033[0;35m{branch}\033[0m'