Skip to content
  • Michael Hanselmann's avatar
    Merge branch 'devel-2.5' · 59d81cb3
    Michael Hanselmann authored
    
    
    * devel-2.5:
      Fix wrong option names in QA and cluster-merge
      Bump version to 2.5.0~rc5, update NEWS
      Add UnescapeAndSplit unittest for multi-escapes
      Fix a bug in command line option parsing code
      cli: Disable abbreviation matching for options
      Bump version to 2.5.0~rc5, update NEWS
      Add UnescapeAndSplit unittest for multi-escapes
      Fix a bug in command line option parsing code
    
    Conflicts:
    	lib/cli.py: Trivial
    
    Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
    Reviewed-by: default avatarIustin Pop <iustin@google.com>
    59d81cb3
To find the state of this project's repository at the time of any of these versions, check out the tags.