tree 5e17b0505fa6aaefc5f295a82fa7ab3139f56c6c
parent 76deaab4e89af726eabacfd58c6678804bc901c1
parent 99855ddf4bd319cd06a0524e755ab1c1b7d39f3b
author Jonathan Nieder <jrnieder@gmail.com> 1380224474 -0700
committer Jonathan Nieder <jrnieder@gmail.com> 1380224474 -0700

Merge branch 'mm/rebase-continue-freebsd-WB' into maint

* mm/rebase-continue-freebsd-WB:
  rebase: fix run_specific_rebase's use of "return" on FreeBSD