1
0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-11-20 10:51:13 +00:00
Commit Graph

8 Commits

Author SHA1 Message Date
Kaleb Elwert
38f0d2f34e Rework diff function
This removes --unified from the default options to make it possible to pass -y
without worrying about conflicting output formats.

diffu has also been added as an alias to make it easier to get output as a
unified diff.

Fixes #1231
2017-04-15 14:06:07 -07:00
Zhiming Wang
464a8d20a1 utility module: fix/improve colordiff call in diff
The new call is compatible with colordiff v1.0.8 - v.1.0.15 (might be
compatible with even earlier versions, but not tested), while the
original one breaks down under v1.0.14 and v1.0.15. See
https://github.com/daveewart/colordiff/issues/22.
2017-04-05 00:23:37 -07:00
Sorin Ionescu
a84ac5b002 Only one newline at end of file 2014-10-09 23:38:15 -04:00
Sorin Ionescu
fb9a20591f [Fix #197] Rebrand as Prezto
Conflicts:
	README.md
	runcoms/zshenv
2012-09-03 16:51:27 -04:00
Sorin Ionescu
e4be6d633f [Fix #195] Fallback to the default command 2012-06-13 14:50:05 -04:00
Sorin Ionescu
7dc55a8304 [#195] Add missing make, diff, wdiff calls 2012-06-13 14:09:57 -04:00
Sorin Ionescu
761ba12813 [#149] Simplify diff, wdiff, make 2012-06-10 20:04:55 -04:00
Sorin Ionescu
45ab153c64 [#149] Move diff, wdiff, make into their own files 2012-06-10 20:04:55 -04:00