summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2018-10-31 10:15:53 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-01 12:08:06 +0900
commit442c36bd08a283b158995fd75d340e6981b80e34 (patch)
tree432010f8d6000879db63a15ed6b07a582c711374 /xdiff-interface.h
parentam: don't die in read_author_script() (diff)
downloadtgif-442c36bd08a283b158995fd75d340e6981b80e34.tar.xz
am: improve author-script error reporting
If there are errors in a user edited author-script there was no indication of what was wrong. This commit adds some specific error messages depending on the problem. It also relaxes the requirement that the variables appear in a specific order in the file to match the behavior of 'rebase --interactive'. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions