# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1321934020 28800
# Node ID b2ad38814e5f21238e036c4d0cbceccef16df7ec
# Parent  89c7493e3442783a18650eed4385ed3e9560df81# Parent  29da26f67b37f7f026839f645f27cd20c6947704
Merged hgrc stuff.

diff -r 89c7493e3442 -r b2ad38814e5f hgrc/README.md
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hgrc/README.md	Mon Nov 21 19:53:40 2011 -0800
@@ -0,0 +1,6 @@
+
+These are my [Mercurial] configuration files.
+
+
+  [mercurial]: http://hg-scm.com
+
diff -r 89c7493e3442 -r b2ad38814e5f hgrc/hgrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hgrc/hgrc	Mon Nov 21 19:53:40 2011 -0800
@@ -0,0 +1,23 @@
+[ui]
+username = Ludovic Chabant <ludovic@chabant.com>
+editor = vim
+
+[diff]
+git=True
+
+[extensions]
+mq =
+color =
+extdiff =
+graphlog =
+record =
+
+[alias]
+clog = glog --limit 10 --style compact
+
+[extdiff]
+cmd.sbsdiff = diff
+opts.sbsdiff = -N -b --side-by-side --width=90
+
+%include .hg\hgrc-${OS}
+
diff -r 89c7493e3442 -r b2ad38814e5f hgrc/hgrc-MacOSX
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hgrc/hgrc-MacOSX	Mon Nov 21 19:53:40 2011 -0800
@@ -0,0 +1,7 @@
+
+[extensions]
+hggit = /usr/local/hg-git/hggit/
+
+[extdiff]
+cmd.opendiff = opendiff-w
+
diff -r 89c7493e3442 -r b2ad38814e5f hgrc/hgrc-Windows_NT
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hgrc/hgrc-Windows_NT	Mon Nov 21 19:53:40 2011 -0800
@@ -0,0 +1,13 @@
+[ui]
+#ssh="${userprofile}\Dropbox\Utilities\plink.exe" -ssh -i "${userprofile}\Dropbox\Personal\Security\PuTTY\key.ppk"
+
+[extensions]
+hggit = ${userprofile}\Code\BitBucket\HgGit\hggit
+
+[extdiff]
+cmds.wdiff = "C:\Program Files (x86)\WinMerge\WinMergeU.exe"
+
+[tortoisehg]
+editor = "C:\Program Files (x86)\Notepad++\notepad++.exe"
+vdiff = "C:\Program Files (x86)\WinMerge\WinMergeU.exe"
+