Beside filterdiff, you have two other options: - use dad (http://dad.dunnewind.net/universe.php) - do a manual merge
If I were you I would try them all, its very instructive anyhow. -- Please merge gramps (2.2.9-1) from Debian unstable (main) https://bugs.launchpad.net/bugs/155487 You received this bug notification because you are a member of Ubuntu Bugs, which is the bug contact for Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
