summaryrefslogtreecommitdiff
path: root/Tools/scripts/diff.py
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-07-26 18:25:14 +0200
committerÉric Araujo <merwok@netwok.org>2011-07-26 18:25:14 +0200
commit9e1af03fbb2a9fc1472ac866add02c99b0c88b16 (patch)
tree25efce5bd9633ba8cb685c9c64464a49da941853 /Tools/scripts/diff.py
parent76748b7033cdd52a95d78d85f2ec15244e5d0fd8 (diff)
parenta0e92a802815d55dafd303b39843ddd2b9784bdb (diff)
downloadcpython-git-9e1af03fbb2a9fc1472ac866add02c99b0c88b16.tar.gz
Branch merge.
I moved the NEWS entry for the reindent fix to the right release section.
Diffstat (limited to 'Tools/scripts/diff.py')
-rwxr-xr-x[-rw-r--r--]Tools/scripts/diff.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Tools/scripts/diff.py b/Tools/scripts/diff.py
index 52dcab1ff9..9efb078fb8 100644..100755
--- a/Tools/scripts/diff.py
+++ b/Tools/scripts/diff.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
""" Command line interface to difflib.py providing diffs in four formats:
* ndiff: lists every line and highlights interline changes.