Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-confused-revert.out @ 1967:72f7a335b955

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
still use old variable names when running hooks. dropped by accident. we set HG_FOO (new name) and FOO (old name). plan is to drop old names after 0.9.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 17 Mar 2006 09:48:43 -0800
parents 30146be3437c
children d436b21b20dc
line wrap: on
line source

%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a back to normal
? b
merging a
%%% should show foo-b
foo-b
%%% should show a removed and b added
A b
R a
reverting...
%%% should show b unknown and a marked modified (merged)
? b
%%% should show foo-b
foo-b