Force merge to delete files
Nikolaus Rath
Nikolaus at rath.org
Sun Jul 4 18:31:00 UTC 2010
Hello,
I am merging with --config ui.merge=internal:other. This works fine if
there are conflicting changes. However, when a file has been removed, I
still have to manually decide what to do, e.g.
resolving manifests
local changed bin/s3qltune which remote deleted
use (c)hanged version or (d)elete? d
How can I get rid of these prompts?
$ hg --version
Mercurial Distributed SCM (version 1.6)
Best,
-Nikolaus
--
»Time flies like an arrow, fruit flies like a Banana.«
PGP fingerprint: 5B93 61F8 4EA2 E279 ABF6 02CF A9AD B7F8 AE4E 425C
More information about the Mercurial
mailing list