ae7720b9e4e3

merge.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Mon, 08 Mar 2010 10:14:14 -0500
parents d068bbcd810d (diff) 68d58637a758 (current diff)
children 4df4cde3b0a9
branches/tags (none)
files .hgrc .hgsubstate

Changes

--- a/.hgrc	Wed Mar 03 18:03:08 2010 -0500
+++ b/.hgrc	Mon Mar 08 10:14:14 2010 -0500
@@ -94,6 +94,12 @@
 fdiff = diff -U 10000000000000
 qfdiff = qdiff -U 10000000000000
 
+dlog = log --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.dlog
+_ = dlog -l15
+__ = _ -l100000000
+o_ = outgoing -n --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.dlog
+i_ = incoming -n --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.dlog
+
 slog = log --style=/Users/sjl/lib/dotfiles/mercurial/templates/map-cmdline.slog
 . = slog -l15
 .. = . -l100000000
--- a/.hgsubstate	Wed Mar 03 18:03:08 2010 -0500
+++ b/.hgsubstate	Mon Mar 08 10:14:14 2010 -0500
@@ -1,1 +1,1 @@
-37585ce7a3df81ff87e067ae1c7c72073853299c mercurial/templates
+a6f3ad9308b55e737256cbd5e4b5dc46fc725e68 mercurial/templates