Mercurial > hg

diff tests/test-merge6.out @ 8684:5bb7780b57c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
match: fold plan cases down to two special cases - merge always and match with patterns - make always and match with patterns the default - invert dostep3 to skipstep3 - move dirignore test inside exact case
author Matt Mackall <mpm@selenic.com>
date Sun, 31 May 2009 17:54:18 -0500
parents 0750f11152fe
children a3d73b3e1f8a
line wrap: on
line diff