changeset 24:b2ad38814e5f

Merged hgrc stuff.
author Ludovic Chabant <ludovic@chabant.com>
date Mon, 21 Nov 2011 19:53:40 -0800
parents 89c7493e3442 (current diff) 29da26f67b37 (diff)
children ee9306f1098c
files
diffstat 4 files changed, 49 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /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
+
--- /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}
+
--- /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
+
--- /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"
+