![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Avery Pennarun <apenwarr@gmail.com> | |
| Sun, 26 Apr 2009 21:44:18 +0000 (17:44 -0400) | ||
| committer | Avery Pennarun <apenwarr@gmail.com> | |
| Sun, 26 Apr 2009 21:44:18 +0000 (17:44 -0400) | ||
| commit | 795e730e71e8a068ce0cb0790512dab0f1922369 | |
| tree | e922853c022a83abaa447dbbc8091381873f3562 | tree | snapshot |
| parent | fa16ab36ad014bcc03acc4313bb0918fb241b54d | commit | diff |
Simplify merges even more aggressively.
If any one of the parents is the same as the current one, then clearly the
other parent branch isn't important, so throw it away entirely.
Can't remember why I didn't do this before, but if I rediscover it, it
definitely needs a unit test.
If any one of the parents is the same as the current one, then clearly the
other parent branch isn't important, so throw it away entirely.
Can't remember why I didn't do this before, but if I rediscover it, it
definitely needs a unit test.
| git-subtree.sh | diff | blob | history |