[PATCH] Make fast forward merges more like normal merges.

Brendan Cully brendan at kublai.com
Wed Jun 6 19:46:37 CDT 2007


On Wednesday, 06 June 2007 at 19:44, Nathan Jones wrote:
> I have been using named branches and fast forward merges lately, but I
> have found that fast forward merges work differently than normal merges:
> 
> 1. Parents are not listed.
> 2. hg log -M displays fast forward merges.
> 3. hg log -p does not display a diff like regular merges.

I don't have a super-strong opinion about it, but I'm not sure these
are bad things. It seems like you're turning fast-forward merges back
into plain old merges.


More information about the Mercurial-devel mailing list