Mercurial > hg

diff tests/test-merge10.t @ 22706:ad25986c4cd3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: introduce :x as short version of internal:x merge tool name "internal:" is so much typing - it is frequently specified on the command line and gives options that are longer than any other I have seen.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 28 Sep 2014 17:15:25 +0200
parents f2719b387380
children eb586ed5d8ce
line wrap: on
line diff