summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2021-02-27 11:42:24 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2021-02-27 11:42:24 +0100
commitfcffefd17b1e679228257fc504bbdf3179113d74 (patch)
tree08c344e217fb6e35a07d9d24bc2cd734cf908b78 /bin
parentb7eafd6b952466fe19b198b461f3e98b543dcba9 (diff)
Current status
Diffstat (limited to 'bin')
-rwxr-xr-xbin/git_diff4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/git_diff b/bin/git_diff
index 8b6d242..a35fc68 100755
--- a/bin/git_diff
+++ b/bin/git_diff
@@ -4,10 +4,10 @@
# From https://stackoverflow.com/a/7669988/3805440, thanks
# side-by-side diff with custom options:
-#/usr/bin/sdiff -w200 -l "$2" "$5"
+/usr/bin/sdiff -w200 -l "$2" "$5"
# using kdiff3 as the side-by-side diff:
-/usr/bin/kdiff3 "$2" "$5"
+#/usr/bin/kdiff3 "$2" "$5"
# using Meld
#/usr/bin/meld "$2" "$5"

Contact - Imprint