git_remote_helpers / git / __init__.pyon commit rebase: show consistent conflict resolution hint (89c7ae9)
   1