mercurial/merge.py
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: remove a flags case
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: pretend ancestor is local to simplify backwards and overwrite
Mon, 08 Jun 2009 18:14:44 -0500 Matt Mackall merge: simplify flag merging code slightly
less more (0) -100 -30 -10 -3 tip