From d501721409e90b3bea0c915de825143aaf78089e Mon Sep 17 00:00:00 2001
From: Chris Adams <wave@chrisadams.me.uk>
Date: Thu, 17 Feb 2011 21:44:30 +0000
Subject: [PATCH] Added tools for dealing with merges in git

---
 zshrc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/zshrc b/zshrc
index 1f8c0acb85..a582815d7a 100755
--- a/zshrc
+++ b/zshrc
@@ -29,9 +29,17 @@ export EDITOR='mvim -f'
 export PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/local/mysql/bin:/usr/local/git/bin:$PATH"
 export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH"
 
-# add handy jump in for notational velocity in Vim
-alias nv='cd ~/Dropbox/mywiki/;mvim .'
+function edit-unmerged () {
+ $EDITOR `git ls-files --unmerged | cut -f2 | sort -u`
+}
+
+function add-unmerged () {
+ git add `git ls-files --unmerged | cut -f2 | sort -u`
+}
+
 
 # Add rvm to give us RVM
 
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"  # This loads RVM into a shell session.
+
+