Changeset View
Changeset View
Standalone View
Standalone View
src/docs/user/userguide/differential_faq.diviner
| Show First 20 Lines • Show All 45 Lines • ▼ Show 20 Lines | |||||
| = How can I enable syntax highlighting? = | = How can I enable syntax highlighting? = | ||||
| You need to install and configure **Pygments** to highlight anything else than | You need to install and configure **Pygments** to highlight anything else than | ||||
| PHP. See the `pygments.enabled` configuration setting. | PHP. See the `pygments.enabled` configuration setting. | ||||
| = What do the whitespace options mean? = | |||||
| Most of these are pretty straightforward, but "Ignore Most" is not: | |||||
| - **Show All**: Show all whitespace. | |||||
| - **Ignore Trailing**: Ignore changes which only affect trailing whitespace. | |||||
| - **Ignore Most**: Ignore changes which only affect leading or trailing | |||||
| whitespace (but not whitespace changes between non-whitespace characters) | |||||
| in files which are not marked as having significant whitespace. | |||||
| In those files, show whitespace changes. By default, Python (.py) and | |||||
| Haskell (.lhs, .hs) are marked as having significant whitespace, but this | |||||
| can be changed in the `differential.whitespace-matters` configuration | |||||
| setting. | |||||
| - **Ignore All**: Ignore all whitespace changes in all files. | |||||
| = What do the very light green and red backgrounds mean? = | = What do the very light green and red backgrounds mean? = | ||||
| Differential uses these colors to mark changes coming from rebase: they are | Differential uses these colors to mark changes coming from rebase: they are | ||||
| part of the diff but they were not added or removed by the author. They can | part of the diff but they were not added or removed by the author. They can | ||||
| appear in diff of diffs against different bases. | appear in diff of diffs against different bases. | ||||
| = Next Steps = | = Next Steps = | ||||
| Continue by: | Continue by: | ||||
| - returning to the @{article:Differential User Guide}. | - returning to the @{article:Differential User Guide}. | ||||