Projects >> accumulo >>0bbc67594b25954ed2cb3a2f04e45789a1c7691c

Chunk
Conflicting content 
    final SortedSet tables = new TreeSet(Arrays.asList(cl.getArgs()));

<<<<<<< HEAD:shell/src/main/java/org/apache/accumulo/shell/commands/DUCommand.java
    if (cl.hasOption(ShellOptions.tableOption)) {
      String tableName = cl.getOptionValue(ShellOptions.tableOption);
      if (!shellState.getConnector().tableOperations().exists(tableName)) {
        throw new TableNotFoundException(tableName, tableName, "specified table that doesn't exist");
      }
      tables.add(tableName);
=======
    if (cl.hasOption(Shell.tableOption)) {
      tables.add(cl.getOptionValue(Shell.tableOption));
>>>>>>> 2b168f819f8dfa865785fd644e6bfa82722ff4d0:core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
    }

    if (cl.hasOption(optNamespace.getOpt())) {
Solution content 
    final SortedSet tables = new TreeSet(Arrays.asList(cl.getArgs()));

    if (cl.hasOption(ShellOptions.tableOption)) {
      tables.add(cl.getOptionValue(ShellOptions.tableOption));
    }

    if (cl.hasOption(optNamespace.getOpt())) {
File
DUCommand.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Variable