Bug#859439: [git-buildpackage/master] import-orig: only abort merge if it got started

Mon, 03 Apr 2017 10:21:23 -0700 

tag 859439 pending
thanks

Date:   Mon Apr 3 19:11:15 2017 +0200
Author: Guido Günther <a...@sigxcpu.org>
Commit ID: 844e4f8a7599cbadbf2b69613090163f8c5bf232
Commit URL: 
https://git.sigxcpu.org/cgit/git-buildpackage//commit/?id=844e4f8a7599cbadbf2b69613090163f8c5bf232
Patch URL: 
https://git.sigxcpu.org/cgit/git-buildpackage//patch/?id=844e4f8a7599cbadbf2b69613090163f8c5bf232

    import-orig: only abort merge if it got started

    This might not be the case when there are e.g. files that would
    be overwritten by the merge in the workig copy

    Closes: #859439

Reply via email to