Mercurial > hg-stable

diff tests/test-resolve.t @ 23111:0dae9147c3b6 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: refer ":merge3" instead of "internal:merge3" According to warning message (introduced by 38e0363dcbe0) in filemerge.py, the former should be used as official name.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 01 Nov 2014 02:43:08 +0900
parents b8dd8432395d
children 18af6ebd4001
line wrap: on
line diff