On Mon, 06 Jan 2014 08:58:56 -0500, Neal Becker wrote: > I didn't find any option in the merge that allowed me to remove an unwanted > unregistered file in local that conflicted with the merge.
Which did you want to do, "hg merge --force" or just delete unversioned file? The latter is "Commit" widget -> "Delete Unversioned". Regards, ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
