Mercurial > hg

diff mercurial/merge.py @ 5421:9b5d626be8ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
osutil: cleanups - use tabs - eliminate old-style function pointer calls - eliminate weird scoping - eliminate assignment-in-iff - use !foo rather than foo == NULL
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Oct 2007 18:47:06 -0500
parents 36c46e20976a
children 77cafe8f89e0
line wrap: on
line diff