diff tests/test-merge-prompt.t @ 19774:7805cb8030e0

rebase: remove bailifchanged check from pullrebase (BC) This saves us a relatively superfluous status check for pull --rebase (if rebase runs, it'll check for a clean working directory anyway), and brings hg pull --rebase closer to hg pull && hg rebase. This is a behavior change because pull --rebase with a dirty working directory will now abort after performing the pull rather than before.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 20 Sep 2013 16:32:05 -0700
parents c8ba98bf0e71
children 9ab18a912c44
line wrap: on
line diff