Permalink
Browse files

More changes.

  • Loading branch information...
1 parent 9ee3ff8 commit 08123489978c5b7c216551f56509f2511256e44e @sjl committed Jan 13, 2010
Showing with 13 additions and 8 deletions.
  1. +11 −7 .hgrc
  2. +1 −0 .zshrc
  3. +1 −1 mercurial/cli-templates/map-cmdline.sglog
View
18 .hgrc
@@ -35,13 +35,13 @@ git = True
[extdiff]
cmd.fmdiff = fmdiff
-[merge-patterns]
-** = filemerge
+#[merge-patterns]
+#** = filemerge
-[merge-tools]
-filemerge.executable = /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
-filemerge.args = -left $other -right $local -ancestor $base -merge $output
-filemerge.gui = True
+#[merge-tools]
+#filemerge.executable = /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
+#filemerge.args = -left $other -right $local -ancestor $base -merge $output
+#filemerge.gui = True
[email]
method = smtp
@@ -91,6 +91,10 @@ cm = commit -m
st = status -C
? = summary
+#mlocal = merge --config 'ui.merge=internal:local'
+#mother = merge --config 'ui.merge=internal:other'
+#mfail = merge --config 'ui.merge=internal:fail'
+
slog = log --style=/Users/sjl/lib/dotfiles/mercurial/cli-templates/map-cmdline.slog
. = slog -l15
.. = . -l100000000
@@ -100,4 +104,4 @@ slog = log --style=/Users/sjl/lib/dotfiles/mercurial/cli-templates/map-cmdline.s
nlog = log --style=/Users/sjl/lib/dotfiles/mercurial/cli-templates/map-cmdline.nlog
n = nlog -vr
-show = nlog -vpr
+show = nlog -vpr
View
1 .zshrc
@@ -19,6 +19,7 @@ alias tweets-stevelosh='~/src/grabtweets/grabtweets.py -p ~/Documents/tweets/ste
alias meme="curl -q --silent meme.boxofjunk.ws/moar.txt?lines=1"
alias deact='deactivate'
alias serve_this='python -m SimpleHTTPServer'
+alias oldgcc='export CC=/usr/bin/gcc-4.0'
# Environment variables ------------------------------------------------------
export EDITOR='vim'
@@ -1,6 +1,6 @@
changeset = '\033[0;33m{rev}\033[0m {desc|firstline|strip}{branches}{tags}\n\n'
-changeset_verbose = '\033[0;33m{rev}\033[0m {desc|firstline|strip}{branches}{tags}\n\033[1;30m({date|age} by {author|person})\033[0m\n\n'
+changeset_verbose = '\033[0;33m{rev}\033[0m:\033[0;33m{node|short}\033[0m {desc|firstline|strip}{branches}{tags}\n\033[1;30m({date|age} by {author|person})\033[0m\n\n'
start_branches = ' '
branch = '\033[0;35m{branch}\033[0m'

0 comments on commit 0812348

Please sign in to comment.