Rebase aborts when encounters merging conflicts
authorFrederic Massart <fred@moodle.com>
Fri, 17 Aug 2012 09:12:04 +0000 (17:12 +0800)
committerFrederic Massart <fred@moodle.com>
Fri, 17 Aug 2012 09:12:04 +0000 (17:12 +0800)
commit923ad894e45c31d90ff5c1c5f2d78d5e45a287aa
tree9188800e0a89dcb4f9c4b81d40d62448849931f0
parentbaa785192d619175fed6eb5ac5783c8804c21308
Rebase aborts when encounters merging conflicts
lib/git.py
moodle-rebase.py