add_n_diff

#!/bin/bash

if [ "${BASH_SOURCE[0]}" -ef "$0" ]
then
    echo "Hey, you should source this script, not execute it!"
    exit 1
fi

reporoot=`git rev-parse --show-toplevel`
these=`git status --porcelain | grep '^UU' | awk '{printf("'${reporoot}'/%s\n", $2)}'`

git add $these
ec  $these
git difftool --cached $these


# then in separate file
# git add -p $these
echo 'git add -p $these'
### pointless change