# HG changeset patch
# User Steve Huston <huston@astro.princeton.edu>
# Date 1367431713 14400
# Node ID a835f8c36e93ba673ff9f087836c1706308a74d2
# Parent  463fe15a340f7af3098ed571c87b395dda763ec2
Fixed PS1 & vimdiff
* PS1 had nonprintable characters in it, but bash didn't know that; so it
  wrapped in all the wrong places.
* vimdiff was using different window placements than kdiff would use, leading
  to much confusion.  This way feels nicer, leaving the "good" output file at
  the bottom.

diff -r 463fe15a340f -r a835f8c36e93 .bashrc
--- a/.bashrc	Mon Apr 29 10:24:04 2013 -0400
+++ b/.bashrc	Wed May 01 14:08:33 2013 -0400
@@ -22,9 +22,9 @@
 #[[ "$PS1" ]] && export PS1='${debian_chroot:+($debian_chroot)}\e[01;32m\h\e[00m:\e[01;34m\w\e[00m\$ '
 [[ "$PS1" ]] && {
   if [ -z "$DARWIN" ] ; then
-    export PS1='${debian_chroot:+($debian_chroot)}\e[01;`case $EUID in 0) echo -n 31; ;; *) echo -n 32; ;; esac;`m\h\e[00m:\e[01;34m\w\e[00m\$ '
+    export PS1='${debian_chroot:+($debian_chroot)}\[\e[01;`case $EUID in 0) echo -n 31; ;; *) echo -n 32; ;; esac;`m\]\h\[\e[00m\]:\[\e[01;34m\]\w\[\e[00m\]\$ '
   else
-    export PS1='${debian_chroot:+($debian_chroot)}\e[01;`case $EUID in 0) echo "31\c"; ;; *) echo -n 32; ;; esac;`m\h\e[00m:\e[01;34m\w\e[00m\$ '
+    export PS1='${debian_chroot:+($debian_chroot)}\[\e[01;`case $EUID in 0) echo "31\c"; ;; *) echo -n 32; ;; esac;`m\]\h\[\e[00m\]:\[\e[01;34m\]\w\[\e[00m\]\$ '
   fi
 }
 export PAGER=less
diff -r 463fe15a340f -r a835f8c36e93 .hgrc
--- a/.hgrc	Mon Apr 29 10:24:04 2013 -0400
+++ b/.hgrc	Wed May 01 14:08:33 2013 -0400
@@ -12,7 +12,7 @@
 
 [merge-tools]
 vimdiff.executable = vim
-vimdiff.args = -d $base $local $output $other -c "wincmd J"
+vimdiff.args = -d $output $base $local $other -c "wincmd J"
 
 [trusted]
 groups = help