Edit article

Title Tags Content

<pre><code class="language-bash">git config --global diff.tool git-bcompare
git config --global diff.tool.git-bcompare.cmd 'git-bcompare "$LOCAL" "$REMOTE"'
git config --global diff.prompt false
cat &lt;&lt;"EOF" &gt; /usr/local/bin/git-bcompare
#!/bin/bash

# diff is called by git with 7 parameters:
# path old-file old-hex old-mode new-file new-hex new-mode

if [ "$5" = /dev/null ]; then
	tmp=$(mktemp) &amp;&amp; trap "rm -f "$tmp"" EXIT
	echo "*** $1 has been deleted ***" &gt; $tmp
	/usr/bin/bcompare "$2" "$tmp"
else
	/usr/bin/bcompare "$2" "$5" # --lefttitle="$1 ($3)" --righttitle="$1 ($6)"
fi

result=$?

case $result in
0)	;&amp; # Success
1)	;&amp; # Binary same
2)	;&amp; # Rules-based same
11)	;&amp; # Binary differences
12)	;&amp; # Similar
13)	   # Rules-based differences
	echo true
	;;
14)	;&amp; #Conflicts detected
100)	;&amp; # Unknown error
101)	;&amp; # Conflicts detected, merge output not written
102)	;&amp; # BComp.exe unable to wait until BCompare.exe finishes
103)	;&amp; # BComp.exe cannot find BCompare.exe
104)	;&amp; # Trial period expired
105)	;&amp; # Error loading script file
106)	;&amp; # Script syntax error
107)	   # Script failed to load folders or files
	exit $result
	;;
esac
EOF</code></pre>

Cancel