# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1407696958 -3600
# Node ID 483a45fc520cc431718cfe106c1924b6afc5767a
# Parent  281a9cb03796c1b355c1191c0c4a2418a28c4d2a# Parent  c88d17a35d61a6e169283028ce6591bf23af74c1
Fix multiple heads from forgotten changes on server

diff -r 281a9cb03796 -r 483a45fc520c gitconfig
--- a/gitconfig	Sun Aug 10 19:54:53 2014 +0100
+++ b/gitconfig	Sun Aug 10 19:55:58 2014 +0100
@@ -14,5 +14,3 @@
 	cmd = meld \"\" \"\"
 [difftool]
 	prompt = false
-[push]
-	default = simple
diff -r 281a9cb03796 -r 483a45fc520c hgrc
--- a/hgrc	Sun Aug 10 19:54:53 2014 +0100
+++ b/hgrc	Sun Aug 10 19:55:58 2014 +0100
@@ -1,6 +1,7 @@
 [ui]
 username = IBBoard <dev@ibboard.co.uk>
 merge = meld
+logtemplate='{rev}:{node|short} - {age(date)} ({phase}){ifeq(p2rev, '-1', '', '\n   Merge: {p1rev}:{p1node|short} && {p2rev}:{p2node|short}')}\n   {tabindent(desc)}\n\n'
 
 [trusted]
 #Trust root (mainly for VPS running, where some repos are owned by root and we want to do "hg status" without sudo-ing) 
diff -r 281a9cb03796 -r 483a45fc520c tmux.conf
--- a/tmux.conf	Sun Aug 10 19:54:53 2014 +0100
+++ b/tmux.conf	Sun Aug 10 19:55:58 2014 +0100
@@ -3,5 +3,5 @@
 set -g status-bg black
 set -g status-fg white
 #set -g terminal-overrides 'xterm*:smcup@:rmcup@'
-setw -g mode-mouse on
-set-window-option -g xterm-keys on
\ No newline at end of file
+#setw -g mode-mouse on
+set-window-option -g xterm-keys on