diff tests/hghave @ 26528:8bfef5737321

filemerge: move 'merging' output to before file creation This has no visible impact but makes some future work simpler.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 22:58:52 -0700
parents 05e7f57c74ac
children 863075fd4cd0
line wrap: on
line diff