summaryrefslogtreecommitdiff
path: root/kwset.h
diff options
context:
space:
mode:
authorLibravatar Paul Tan <pyokagan@gmail.com>2015-06-18 18:54:11 +0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-18 13:18:52 -0700
commitb7b314711ad28b129e6c5916eee1f2036ffa94df (patch)
tree0fb4e3ed64839a130403d49e6c310995c525933a /kwset.h
parentpull --rebase: exit early when the working directory is dirty (diff)
downloadtgif-b7b314711ad28b129e6c5916eee1f2036ffa94df.tar.xz
pull --rebase: error on no merge candidate cases
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 <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'kwset.h')
0 files changed, 0 insertions, 0 deletions