| 2010-04-03 | Merge branch 'rb/maint-python-path' | blob | diff | raw | |
| 2010-04-03 | Merge branch 'jn/merge-diff3-label' | blob | diff | raw | |
| 2010-03-21 | cherry-pick, revert: add a label for ancestor | blob | diff | raw | |
| 2010-03-21 | revert: clarify label on conflict hunks | blob | diff | raw | diff to current | |
| 2010-03-21 | tests: document cherry-pick behavior in face of conflicts | blob | diff | raw | diff to current | |