Commits

Paul McLanahan committed 49c787f

Added options for ACK.
Added filemerge settings to hgrc.
Fixed an issue on OSX of pip not being in the path before it's called.

  • Participants
  • Parent commits 4748127

Comments (0)

Files changed (3)

 
 export LESS="-FSRXi"
 export GRIN_ARGS="-C 2"
+export ACK_OPTIONS="--pager=less -C 2"
 
 # check the window size after each command and, if necessary,
 # update the values of LINES and COLUMNS.
 [extdiff]
 cmd.kdiff3 =
 cmd.meld =
+cmd.filemerge = opendiff-w
+cmd.opendiff = opendiff-w
 
 [merge-tools]
+filemerge.executable= opendiff-w
+filemerge.args=-left $other -right $local -ancestor $base -merge $output
+filemerge.gui=True
+
 kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
 kdiff3.regkey=Software\KDiff3
 kdiff3.regappend=\kdiff3.exe
 [defaults]
 #glog = --template 'changeset:   {rev}:{node|short} {tags}\nsummary:     {desc|firstline|fill68|tabindent|tabindent}\n\n'
 addremove = --similarity 100
+summary = --remote
 
 [alias]
 slog = log --template '{rev}:{node|short} {desc|firstline}\n'

dotfiles/.profile

-# if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f ~/.bashrc ]; then
-	. ~/.bashrc
-    fi
-fi
-
 # set PATH so it includes user's private bin if it exists
 if [ -d ~/bin ] ; then
     PATH=~/bin:"${PATH}"
 export JAVA_HOME=/usr/lib/jvm/java-6-sun
 export JDK_HOME=$JAVA_HOME
 
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f ~/.bashrc ]; then
+	. ~/.bashrc
+    fi
+fi
+
 if [ -f ~/.profile_local ]; then
     . ~/.profile_local
 fi