Re: [PATCH v2 18/19] pull --rebase: error on no merge candidate cases

2015-06-03 Thread Stefan Beller
On Tue, Jun 2, 2015 at 11:49 PM, Paul Tan wrote: > Tweak the error messages printed by die_no_merge_candidates() to take > into account that we may be "rebasing against" rather than "merging > with". > > Signed-off-by: Paul Tan > --- > > Notes: > v2 > > * Decided to use fprintf_ln() for t

[PATCH v2 18/19] pull --rebase: error on no merge candidate cases

2015-06-02 Thread Paul Tan
Tweak the error messages printed by die_no_merge_candidates() to take into account that we may be "rebasing against" rather than "merging with". Signed-off-by: Paul Tan --- Notes: v2 * Decided to use fprintf_ln() for the sake of code consistency, and for the added trailing new