Merge lp:~ace17/bzr/fixDiff4 into lp:bzr
|Diff against target:||
31 lines (+10/-9)
1 file modified
|To merge this branch:||bzr merge lp:~ace17/bzr/fixDiff4|
Description of the Change
Fixes a bug causing --diff-options being passed to the external GNU diff program when a custom diff tool has been specified.
ace@ANTEC bzr-test % bzr status -V
ace@ANTEC bzr-test % bzr diff --using gvimdiff --diff-options "-f"
=== added file 'File1'
diff: conflicting output style options
diff: Try `diff --help' for more information.
bzr: ERROR: external diff failed with exit code 2; command: ['diff', '--label', u'File1\t1970-01-01 00:00:00 +0000', '/tmp/bzr-