Search Results for "ancestor"

...Essentially, when your working directory has uncommitted changes on top of draft changesets, you can run hg absorb and the uncommitted modifications are automagically folded ("absorbed") into the appropriate draft ancestor changesets. This is essentially doing hg histedit + "roll" actions without having to make a commit or manually make history modification rules. The command essentially looks at the lines that were modified, finds a changeset modifying those lines, and amends that changeset to include your uncommitted changes. If the changes can't be made without conflicts, they remain uncommitted. ...

Here is only release files. Project hosted here: https://github.com/azarkevich/VSS3WayMerge

MergeRight is a graphical tool for comparing and merging multiple versions or revisions of a text or source file, with or without a specified common ancestor, with recommendations for passages in conflict, easy inclusion and exclusion, and live editing.