Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: remove a flags case | file | diff | annotate |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: pretend ancestor is local to simplify backwards and overwrite | file | diff | annotate |
Mon, 08 Jun 2009 18:14:44 -0500 | Matt Mackall | merge: simplify flag merging code slightly | file | diff | annotate |