Mercurial > repos > other > linux
changeset 17:483a45fc520c
Fix multiple heads from forgotten changes on server
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sun, 10 Aug 2014 19:55:58 +0100 |
| parents | 281a9cb03796 (current diff) c88d17a35d61 (diff) |
| children | 1ec9a1720c5c |
| files | |
| diffstat | 3 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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)
--- 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