Mercurial > hg

diff tests/test-rebase-abort.t @ 22195:1dad76c0afb7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
largefiles: add test for large/normal conflict at linear merging Before this patch, there is no explicit test for it: test-issue3084.t seems to test such conflict only at branch merging. This patch uses "[debug] dirstate.delaywrite" feature for the tests expecting "M" status of largefiles, to confirm certainly whether files are marked unexpectedly as "clean".
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Fri, 15 Aug 2014 20:28:51 +0900
parents 46c2331fc750
children 328afbad6e57
line wrap: on
line diff