summaryrefslogtreecommitdiff
path: root/git-commit-script
diff options
context:
space:
mode:
authorAvery Pennarun <apenwarr@gmail.com>2009-04-26 17:44:18 -0400
committerAvery Pennarun <apenwarr@gmail.com>2009-04-26 17:44:18 -0400
commit795e730e71e8a068ce0cb0790512dab0f1922369 (patch)
treee922853c022a83abaa447dbbc8091381873f3562 /git-commit-script
parentfa16ab36ad014bcc03acc4313bb0918fb241b54d (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.
Diffstat (limited to 'git-commit-script')
0 files changed, 0 insertions, 0 deletions