merge: use repo.ui directly instead local variable
The non-standard 'u = repo.ui' shorthand was only used two times and
there were many other full references to repo.ui.
======
hgrc
======
---------------------------------
configuration files for Mercurial
---------------------------------
:Author: Bryan O'Sullivan <bos@serpentine.com>
:Organization: Mercurial
:Manual section: 5
:Manual group: Mercurial Manual
.. contents::
:backlinks: top
:class: htmlonly
Synopsis
--------
.. include:: ../mercurial/help/config.txt
Author
------
Bryan O'Sullivan <bos@serpentine.com>.
Mercurial was written by Matt Mackall <mpm@selenic.com>.
See Also
--------
|hg(1)|_, |hgignore(5)|_
Copying
-------
This manual page is copyright 2005 Bryan O'Sullivan.
Mercurial is copyright 2005-2010 Matt Mackall.
Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version.
.. include:: common.txt