# HG changeset patch # User Afuna # Date 1297416204 -28800 # Node ID 661331407163a469fbbeb7fb8acab0dc6fc29328 # Parent 6f9616a46f7c666610c5d7add49d710e60285acb doc: Add diff.unified to the hgrc docs. diff -r 6f9616a46f7c -r 661331407163 doc/hgrc.5.txt --- a/doc/hgrc.5.txt Wed Jan 26 18:19:49 2011 +0800 +++ b/doc/hgrc.5.txt Fri Feb 11 17:23:24 2011 +0800 @@ -330,8 +330,8 @@ ``diff`` """""""" -Settings used when displaying diffs. They are all Boolean and -defaults to False. +Settings used when displaying diffs. Everything except for ``unified`` is a +Boolean and defaults to False. ``git`` Use git extended diff format. @@ -345,6 +345,8 @@ Ignore changes in the amount of white space. ``ignoreblanklines`` Ignore changes whose lines are all blank. +``unified`` + Number of lines of context to show. ``email`` """""""""