Mercurial > hg

diff tests/test-merge4.out @ 6008:33bfedc0be4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: add an example set of global settings for common merge tools
author Matt Mackall <mpm@selenic.com>
date Sun, 03 Feb 2008 19:29:05 -0600
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line diff