Skip to content
  • Siddharth Agarwal's avatar
    commands.resolve: don't allow users to mark or unmark driver-resolved files · c0aab5961876
    Siddharth Agarwal authored
    Users will often be in the habit of running 'hg resolve --mark --all' after
    resolving merge conflicts in source files. We need to make sure this doesn't
    cause driver-resolved files to be marked.
    
    'hg resolve --all' will resolve driver-resolved files, though.
    
    The weird conditional structure is to accommodate an upcoming patch.
    c0aab5961876