From f3404ce0a65dc8b8a7b3fd9b80b2415e48ef8037 Mon Sep 17 00:00:00 2001
From: Richard Whitehouse <github@richardwhiuk.com>
Date: Sun, 18 Mar 2012 15:10:03 +0000
Subject: [PATCH] Inital commit from Mac

---
 gitignore_global |  4 ++++
 hgignore_global  |  4 ++++
 hgrc             | 17 +++++++++++++++++
 profile          | 22 ++++++++++++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 hgignore_global
 create mode 100644 hgrc
 create mode 100644 profile

diff --git a/gitignore_global b/gitignore_global
index 655ad80..7b3af93 100644
--- a/gitignore_global
+++ b/gitignore_global
@@ -26,3 +26,7 @@ Icon?
 Thumbs.db
 .AppleDouble
 
+# Backup files
+
+*~
+
diff --git a/hgignore_global b/hgignore_global
new file mode 100644
index 0000000..187b396
--- /dev/null
+++ b/hgignore_global
@@ -0,0 +1,4 @@
+syntax: glob
+
+*~
+.DS_Store
diff --git a/hgrc b/hgrc
new file mode 100644
index 0000000..4a1e057
--- /dev/null
+++ b/hgrc
@@ -0,0 +1,17 @@
+[ui]
+username=Richard Whitehouse <github@richardwhiuk.com>
+ignore=/Users/richardwhiuk/.hgignore_global
+[merge-tools]
+sourcetreemerge.gui=False
+sourcetreebulkmerge.gui=False
+sourcetreemerge.binary=False
+sourcetreebulkmerge.executable=/Applications/SourceTree.app/Contents/Resources/hg-merge.sh
+sourcetreemerge.args=$local $other -ancestor $base -merge $output
+sourcetreemerge.checkconflicts=True
+sourcetreemerge.premerge=True
+sourcetreemerge.executable=/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh
+sourcetreebulkmerge.premerge=False
+sourcetreebulkmerge.binary=True
+[extdiff]
+cmd.sourcetreediff=opendiff
+opts.sourcetreediff=
diff --git a/profile b/profile
new file mode 100644
index 0000000..c9db459
--- /dev/null
+++ b/profile
@@ -0,0 +1,22 @@
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+# see /usr/share/doc/bash/examples/startup-files for examples.
+# the files are located in the bash-doc package.
+
+# the default umask is set in /etc/profile; for setting the umask
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
+
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f "$HOME/.bashrc" ]; then
+	. "$HOME/.bashrc"
+    fi
+fi
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/bin" ] ; then
+    PATH="$HOME/bin:$PATH"
+fi
-- 
2.34.1