← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

  • Committer: Vincent Ladeuil
  • Date: 2014-10-06 12:31:59 UTC
  • mto: This revision was merged to the branch mainline in revision 6601.
  • Revision ID: v.ladeuil+lp@free.fr-20141006123159-7q567ts4y38nwn89
Doh, this is *still* supported by diff 3.3 (just not documented in the man page nor the online help anymore).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
157
157
# diff style options as of GNU diff v3.2
158
158
style_option_list = ['-c', '-C', '--context',
159
159
                     '-e', '--ed',
160
 
                     '-f', '--forward-ed', # Not in diff 3.3 ??
 
160
                     '-f', '--forward-ed',
161
161
                     '-q', '--brief',
162
162
                     '--normal',
163
163
                     '-n', '--rcs',