From 66e4597b8545a5476790ce7a2562fd6dfd9f845b Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Mon, 27 Jan 2014 10:38:26 -0500
Subject: [PATCH] update git Beyond Compare difftool from BC2 to BC3

---
 bash_aliases | 14 +++++++-------
 git_bc3diff  |  5 +++++
 git_bc3merge |  6 ++++++
 3 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100755 git_bc3diff
 create mode 100755 git_bc3merge

diff --git a/bash_aliases b/bash_aliases
index e663339..21f94ec 100755
--- a/bash_aliases
+++ b/bash_aliases
@@ -168,13 +168,13 @@ function git-config-joshs()
     git config --global alias.mktarxz '!function f { name="$1"; pos="$2"; if [ "$pos" == "" ]; then pos=HEAD; fi; git archive --prefix="$name"/ "$pos" | xz > ../"$name".tar.xz; }; f'
     git config --global push.default upstream
     if [ -e /bin/cygwin1.dll ]; then
-        git config --global alias.bcdiff 'difftool -y -t bc2'
-        git config --global alias.bcdiffc 'difftool -y -t bc2 --cached'
-        git config --global difftool.bc2.cmd 'git_bc2diff "$LOCAL" "$REMOTE"'
-        git config --global alias.bcmerge 'mergetool -y -t bc2'
-        git config --global mergetool.bc2.cmd \
-            'git_bc2merge "$LOCAL" "$REMOTE" "$MERGED"'
-        git config --global mergetool.bc2.trustExitCode false
+        git config --global alias.bcdiff 'difftool -y -t bc3'
+        git config --global alias.bcdiffc 'difftool -y -t bc3 --cached'
+        git config --global difftool.bc3.cmd 'git_bc3diff "$LOCAL" "$REMOTE"'
+        git config --global alias.bcmerge 'mergetool -y -t bc3'
+        git config --global mergetool.bc3.cmd \
+            'git_bc3merge "$LOCAL" "$REMOTE" "$MERGED"'
+        git config --global mergetool.bc3.trustExitCode false
     fi
 }
 function git-config-local-personal()
diff --git a/git_bc3diff b/git_bc3diff
new file mode 100755
index 0000000..e4e3c31
--- /dev/null
+++ b/git_bc3diff
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+path1=$(cygpath -w "$1")
+path2=$(cygpath -w "$2")
+'/cygdrive/c/Program Files (x86)/Beyond Compare 3/BComp.exe' "$path1" "$path2" /title1=Base /leftreadonly
diff --git a/git_bc3merge b/git_bc3merge
new file mode 100755
index 0000000..ae8c13c
--- /dev/null
+++ b/git_bc3merge
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+local=$(cygpath -w "$1")
+remote=$(cygpath -w "$2")
+merged=$(cygpath -w "$3")
+'/cygdrive/c/Program Files (x86)/Beyond Compare 3/BComp.exe' "$local" "$remote" /title1=Local /title2=Remote /savetarget="$merged"