Merge "Extend merge support for bare repositories"