http://www.eclipse.org/jgit//org.eclipse.jgit: Repository access and algorithms (Eclipse JGit Project)
  • Eclipse Distribution License (New BSD License)
  • Andrey Loskutov
  • Christian Halstrick
  • Dave Borowitz
  • David Pursehouse
  • Gunnar Wagenknecht
  • Jonathan Nieder
  • Jonathan Tan
  • Matthias Sohn
  • Sasa Zivkov
  • Terry Parker
  • Thomas Wolf 
public class org.eclipse.jgit.api.MergeResult
  minor version: 0
  major version: 59
  flags: flags: (0x0021) ACC_PUBLIC, ACC_SUPER
  this_class: org.eclipse.jgit.api.MergeResult
  super_class: java.lang.Object
{
  private org.eclipse.jgit.lib.ObjectId[] mergedCommits;
    descriptor: [Lorg/eclipse/jgit/lib/ObjectId;
    flags: (0x0002) ACC_PRIVATE

  private org.eclipse.jgit.lib.ObjectId base;
    descriptor: Lorg/eclipse/jgit/lib/ObjectId;
    flags: (0x0002) ACC_PRIVATE

  private org.eclipse.jgit.lib.ObjectId newHead;
    descriptor: Lorg/eclipse/jgit/lib/ObjectId;
    flags: (0x0002) ACC_PRIVATE

  private java.util.Map<java.lang.String, int[][]> conflicts;
    descriptor: Ljava/util/Map;
    flags: (0x0002) ACC_PRIVATE
    Signature: Ljava/util/Map<Ljava/lang/String;[[I>;

  private org.eclipse.jgit.api.MergeResult$MergeStatus mergeStatus;
    descriptor: Lorg/eclipse/jgit/api/MergeResult$MergeStatus;
    flags: (0x0002) ACC_PRIVATE

  private java.lang.String description;
    descriptor: Ljava/lang/String;
    flags: (0x0002) ACC_PRIVATE

  private org.eclipse.jgit.merge.MergeStrategy mergeStrategy;
    descriptor: Lorg/eclipse/jgit/merge/MergeStrategy;
    flags: (0x0002) ACC_PRIVATE

  private java.util.Map<java.lang.String, org.eclipse.jgit.merge.ResolveMerger$MergeFailureReason> failingPaths;
    descriptor: Ljava/util/Map;
    flags: (0x0002) ACC_PRIVATE
    Signature: Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/ResolveMerger$MergeFailureReason;>;

  private java.util.List<java.lang.String> checkoutConflicts;
    descriptor: Ljava/util/List;
    flags: (0x0002) ACC_PRIVATE
    Signature: Ljava/util/List<Ljava/lang/String;>;

  public void <init>(org.eclipse.jgit.lib.ObjectId, org.eclipse.jgit.lib.ObjectId, org.eclipse.jgit.lib.ObjectId[], org.eclipse.jgit.api.MergeResult$MergeStatus, org.eclipse.jgit.merge.MergeStrategy, java.util.Map<java.lang.String, org.eclipse.jgit.merge.MergeResult<?>>);
    descriptor: (Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/lib/ObjectId;[Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/api/MergeResult$MergeStatus;Lorg/eclipse/jgit/merge/MergeStrategy;Ljava/util/Map;)V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=8, locals=7, args_size=7
        start local 0 // org.eclipse.jgit.api.MergeResult this
        start local 1 // org.eclipse.jgit.lib.ObjectId newHead
        start local 2 // org.eclipse.jgit.lib.ObjectId base
        start local 3 // org.eclipse.jgit.lib.ObjectId[] mergedCommits
        start local 4 // org.eclipse.jgit.api.MergeResult$MergeStatus mergeStatus
        start local 5 // org.eclipse.jgit.merge.MergeStrategy mergeStrategy
        start local 6 // java.util.Map lowLevelResults
         0: .line 274
            aload 0 /* this */
            aload 1 /* newHead */
            aload 2 /* base */
            aload 3 /* mergedCommits */
            aload 4 /* mergeStatus */
            aload 5 /* mergeStrategy */
         1: .line 275
            aload 6 /* lowLevelResults */
            aconst_null
            invokespecial org.eclipse.jgit.api.MergeResult.<init>:(Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/lib/ObjectId;[Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/api/MergeResult$MergeStatus;Lorg/eclipse/jgit/merge/MergeStrategy;Ljava/util/Map;Ljava/lang/String;)V
         2: .line 276
            return
        end local 6 // java.util.Map lowLevelResults
        end local 5 // org.eclipse.jgit.merge.MergeStrategy mergeStrategy
        end local 4 // org.eclipse.jgit.api.MergeResult$MergeStatus mergeStatus
        end local 3 // org.eclipse.jgit.lib.ObjectId[] mergedCommits
        end local 2 // org.eclipse.jgit.lib.ObjectId base
        end local 1 // org.eclipse.jgit.lib.ObjectId newHead
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot             Name  Signature
            0    3     0             this  Lorg/eclipse/jgit/api/MergeResult;
            0    3     1          newHead  Lorg/eclipse/jgit/lib/ObjectId;
            0    3     2             base  Lorg/eclipse/jgit/lib/ObjectId;
            0    3     3    mergedCommits  [Lorg/eclipse/jgit/lib/ObjectId;
            0    3     4      mergeStatus  Lorg/eclipse/jgit/api/MergeResult$MergeStatus;
            0    3     5    mergeStrategy  Lorg/eclipse/jgit/merge/MergeStrategy;
            0    3     6  lowLevelResults  Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/MergeResult<*>;>;
    Signature: (Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/lib/ObjectId;[Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/api/MergeResult$MergeStatus;Lorg/eclipse/jgit/merge/MergeStrategy;Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/MergeResult<*>;>;)V
    MethodParameters:
                 Name  Flags
      newHead          
      base             
      mergedCommits    
      mergeStatus      
      mergeStrategy    
      lowLevelResults  

  public void <init>(org.eclipse.jgit.lib.ObjectId, org.eclipse.jgit.lib.ObjectId, org.eclipse.jgit.lib.ObjectId[], org.eclipse.jgit.api.MergeResult$MergeStatus, org.eclipse.jgit.merge.MergeStrategy, java.util.Map<java.lang.String, org.eclipse.jgit.merge.MergeResult<?>>, java.lang.String);
    descriptor: (Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/lib/ObjectId;[Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/api/MergeResult$MergeStatus;Lorg/eclipse/jgit/merge/MergeStrategy;Ljava/util/Map;Ljava/lang/String;)V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=9, locals=8, args_size=8
        start local 0 // org.eclipse.jgit.api.MergeResult this
        start local 1 // org.eclipse.jgit.lib.ObjectId newHead
        start local 2 // org.eclipse.jgit.lib.ObjectId base
        start local 3 // org.eclipse.jgit.lib.ObjectId[] mergedCommits
        start local 4 // org.eclipse.jgit.api.MergeResult$MergeStatus mergeStatus
        start local 5 // org.eclipse.jgit.merge.MergeStrategy mergeStrategy
        start local 6 // java.util.Map lowLevelResults
        start local 7 // java.lang.String description
         0: .line 304
            aload 0 /* this */
            aload 1 /* newHead */
            aload 2 /* base */
            aload 3 /* mergedCommits */
            aload 4 /* mergeStatus */
            aload 5 /* mergeStrategy */
         1: .line 305
            aload 6 /* lowLevelResults */
            aconst_null
            aload 7 /* description */
            invokespecial org.eclipse.jgit.api.MergeResult.<init>:(Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/lib/ObjectId;[Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/api/MergeResult$MergeStatus;Lorg/eclipse/jgit/merge/MergeStrategy;Ljava/util/Map;Ljava/util/Map;Ljava/lang/String;)V
         2: .line 306
            return
        end local 7 // java.lang.String description
        end local 6 // java.util.Map lowLevelResults
        end local 5 // org.eclipse.jgit.merge.MergeStrategy mergeStrategy
        end local 4 // org.eclipse.jgit.api.MergeResult$MergeStatus mergeStatus
        end local 3 // org.eclipse.jgit.lib.ObjectId[] mergedCommits
        end local 2 // org.eclipse.jgit.lib.ObjectId base
        end local 1 // org.eclipse.jgit.lib.ObjectId newHead
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot             Name  Signature
            0    3     0             this  Lorg/eclipse/jgit/api/MergeResult;
            0    3     1          newHead  Lorg/eclipse/jgit/lib/ObjectId;
            0    3     2             base  Lorg/eclipse/jgit/lib/ObjectId;
            0    3     3    mergedCommits  [Lorg/eclipse/jgit/lib/ObjectId;
            0    3     4      mergeStatus  Lorg/eclipse/jgit/api/MergeResult$MergeStatus;
            0    3     5    mergeStrategy  Lorg/eclipse/jgit/merge/MergeStrategy;
            0    3     6  lowLevelResults  Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/MergeResult<*>;>;
            0    3     7      description  Ljava/lang/String;
    Signature: (Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/lib/ObjectId;[Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/api/MergeResult$MergeStatus;Lorg/eclipse/jgit/merge/MergeStrategy;Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/MergeResult<*>;>;Ljava/lang/String;)V
    MethodParameters:
                 Name  Flags
      newHead          
      base             
      mergedCommits    
      mergeStatus      
      mergeStrategy    
      lowLevelResults  
      description      

  public void <init>(org.eclipse.jgit.lib.ObjectId, org.eclipse.jgit.lib.ObjectId, org.eclipse.jgit.lib.ObjectId[], org.eclipse.jgit.api.MergeResult$MergeStatus, org.eclipse.jgit.merge.MergeStrategy, java.util.Map<java.lang.String, org.eclipse.jgit.merge.MergeResult<?>>, java.util.Map<java.lang.String, org.eclipse.jgit.merge.ResolveMerger$MergeFailureReason>, java.lang.String);
    descriptor: (Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/lib/ObjectId;[Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/api/MergeResult$MergeStatus;Lorg/eclipse/jgit/merge/MergeStrategy;Ljava/util/Map;Ljava/util/Map;Ljava/lang/String;)V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=3, locals=11, args_size=9
        start local 0 // org.eclipse.jgit.api.MergeResult this
        start local 1 // org.eclipse.jgit.lib.ObjectId newHead
        start local 2 // org.eclipse.jgit.lib.ObjectId base
        start local 3 // org.eclipse.jgit.lib.ObjectId[] mergedCommits
        start local 4 // org.eclipse.jgit.api.MergeResult$MergeStatus mergeStatus
        start local 5 // org.eclipse.jgit.merge.MergeStrategy mergeStrategy
        start local 6 // java.util.Map lowLevelResults
        start local 7 // java.util.Map failingPaths
        start local 8 // java.lang.String description
         0: .line 332
            aload 0 /* this */
            invokespecial java.lang.Object.<init>:()V
         1: .line 337
            aload 0 /* this */
            aload 1 /* newHead */
            putfield org.eclipse.jgit.api.MergeResult.newHead:Lorg/eclipse/jgit/lib/ObjectId;
         2: .line 338
            aload 0 /* this */
            aload 3 /* mergedCommits */
            putfield org.eclipse.jgit.api.MergeResult.mergedCommits:[Lorg/eclipse/jgit/lib/ObjectId;
         3: .line 339
            aload 0 /* this */
            aload 2 /* base */
            putfield org.eclipse.jgit.api.MergeResult.base:Lorg/eclipse/jgit/lib/ObjectId;
         4: .line 340
            aload 0 /* this */
            aload 4 /* mergeStatus */
            putfield org.eclipse.jgit.api.MergeResult.mergeStatus:Lorg/eclipse/jgit/api/MergeResult$MergeStatus;
         5: .line 341
            aload 0 /* this */
            aload 5 /* mergeStrategy */
            putfield org.eclipse.jgit.api.MergeResult.mergeStrategy:Lorg/eclipse/jgit/merge/MergeStrategy;
         6: .line 342
            aload 0 /* this */
            aload 8 /* description */
            putfield org.eclipse.jgit.api.MergeResult.description:Ljava/lang/String;
         7: .line 343
            aload 0 /* this */
            aload 7 /* failingPaths */
            putfield org.eclipse.jgit.api.MergeResult.failingPaths:Ljava/util/Map;
         8: .line 344
            aload 6 /* lowLevelResults */
            ifnull 14
         9: .line 345
            aload 6 /* lowLevelResults */
        10: .line 346
            invokeinterface java.util.Map.entrySet:()Ljava/util/Set;
            invokeinterface java.util.Set.iterator:()Ljava/util/Iterator;
            astore 10
            goto 13
      StackMap locals: org.eclipse.jgit.api.MergeResult org.eclipse.jgit.lib.ObjectId org.eclipse.jgit.lib.ObjectId org.eclipse.jgit.lib.ObjectId[] org.eclipse.jgit.api.MergeResult$MergeStatus org.eclipse.jgit.merge.MergeStrategy java.util.Map java.util.Map java.lang.String top java.util.Iterator
      StackMap stack:
        11: aload 10
            invokeinterface java.util.Iterator.next:()Ljava/lang/Object;
            checkcast java.util.Map$Entry
            astore 9 /* result */
        start local 9 // java.util.Map$Entry result
        12: .line 347
            aload 0 /* this */
            aload 9 /* result */
            invokeinterface java.util.Map$Entry.getKey:()Ljava/lang/Object;
            checkcast java.lang.String
            aload 9 /* result */
            invokeinterface java.util.Map$Entry.getValue:()Ljava/lang/Object;
            checkcast org.eclipse.jgit.merge.MergeResult
            invokevirtual org.eclipse.jgit.api.MergeResult.addConflict:(Ljava/lang/String;Lorg/eclipse/jgit/merge/MergeResult;)V
        end local 9 // java.util.Map$Entry result
        13: .line 345
      StackMap locals:
      StackMap stack:
            aload 10
            invokeinterface java.util.Iterator.hasNext:()Z
            ifne 11
        14: .line 348
      StackMap locals: org.eclipse.jgit.api.MergeResult org.eclipse.jgit.lib.ObjectId org.eclipse.jgit.lib.ObjectId org.eclipse.jgit.lib.ObjectId[] org.eclipse.jgit.api.MergeResult$MergeStatus org.eclipse.jgit.merge.MergeStrategy java.util.Map java.util.Map java.lang.String
      StackMap stack:
            return
        end local 8 // java.lang.String description
        end local 7 // java.util.Map failingPaths
        end local 6 // java.util.Map lowLevelResults
        end local 5 // org.eclipse.jgit.merge.MergeStrategy mergeStrategy
        end local 4 // org.eclipse.jgit.api.MergeResult$MergeStatus mergeStatus
        end local 3 // org.eclipse.jgit.lib.ObjectId[] mergedCommits
        end local 2 // org.eclipse.jgit.lib.ObjectId base
        end local 1 // org.eclipse.jgit.lib.ObjectId newHead
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot             Name  Signature
            0   15     0             this  Lorg/eclipse/jgit/api/MergeResult;
            0   15     1          newHead  Lorg/eclipse/jgit/lib/ObjectId;
            0   15     2             base  Lorg/eclipse/jgit/lib/ObjectId;
            0   15     3    mergedCommits  [Lorg/eclipse/jgit/lib/ObjectId;
            0   15     4      mergeStatus  Lorg/eclipse/jgit/api/MergeResult$MergeStatus;
            0   15     5    mergeStrategy  Lorg/eclipse/jgit/merge/MergeStrategy;
            0   15     6  lowLevelResults  Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/MergeResult<*>;>;
            0   15     7     failingPaths  Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/ResolveMerger$MergeFailureReason;>;
            0   15     8      description  Ljava/lang/String;
           12   13     9           result  Ljava/util/Map$Entry<Ljava/lang/String;Lorg/eclipse/jgit/merge/MergeResult<*>;>;
    Signature: (Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/lib/ObjectId;[Lorg/eclipse/jgit/lib/ObjectId;Lorg/eclipse/jgit/api/MergeResult$MergeStatus;Lorg/eclipse/jgit/merge/MergeStrategy;Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/MergeResult<*>;>;Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/ResolveMerger$MergeFailureReason;>;Ljava/lang/String;)V
    MethodParameters:
                 Name  Flags
      newHead          
      base             
      mergedCommits    
      mergeStatus      
      mergeStrategy    
      lowLevelResults  
      failingPaths     
      description      

  public void <init>(java.util.List<java.lang.String>);
    descriptor: (Ljava/util/List;)V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=2, locals=2, args_size=2
        start local 0 // org.eclipse.jgit.api.MergeResult this
        start local 1 // java.util.List checkoutConflicts
         0: .line 357
            aload 0 /* this */
            invokespecial java.lang.Object.<init>:()V
         1: .line 358
            aload 0 /* this */
            aload 1 /* checkoutConflicts */
            putfield org.eclipse.jgit.api.MergeResult.checkoutConflicts:Ljava/util/List;
         2: .line 359
            aload 0 /* this */
            getstatic org.eclipse.jgit.api.MergeResult$MergeStatus.CHECKOUT_CONFLICT:Lorg/eclipse/jgit/api/MergeResult$MergeStatus;
            putfield org.eclipse.jgit.api.MergeResult.mergeStatus:Lorg/eclipse/jgit/api/MergeResult$MergeStatus;
         3: .line 360
            return
        end local 1 // java.util.List checkoutConflicts
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot               Name  Signature
            0    4     0               this  Lorg/eclipse/jgit/api/MergeResult;
            0    4     1  checkoutConflicts  Ljava/util/List<Ljava/lang/String;>;
    Signature: (Ljava/util/List<Ljava/lang/String;>;)V
    MethodParameters:
                   Name  Flags
      checkoutConflicts  

  public org.eclipse.jgit.lib.ObjectId getNewHead();
    descriptor: ()Lorg/eclipse/jgit/lib/ObjectId;
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=1, locals=1, args_size=1
        start local 0 // org.eclipse.jgit.api.MergeResult this
         0: .line 368
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.newHead:Lorg/eclipse/jgit/lib/ObjectId;
            areturn
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot  Name  Signature
            0    1     0  this  Lorg/eclipse/jgit/api/MergeResult;

  public org.eclipse.jgit.api.MergeResult$MergeStatus getMergeStatus();
    descriptor: ()Lorg/eclipse/jgit/api/MergeResult$MergeStatus;
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=1, locals=1, args_size=1
        start local 0 // org.eclipse.jgit.api.MergeResult this
         0: .line 377
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.mergeStatus:Lorg/eclipse/jgit/api/MergeResult$MergeStatus;
            areturn
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot  Name  Signature
            0    1     0  this  Lorg/eclipse/jgit/api/MergeResult;

  public org.eclipse.jgit.lib.ObjectId[] getMergedCommits();
    descriptor: ()[Lorg/eclipse/jgit/lib/ObjectId;
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=1, locals=1, args_size=1
        start local 0 // org.eclipse.jgit.api.MergeResult this
         0: .line 386
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.mergedCommits:[Lorg/eclipse/jgit/lib/ObjectId;
            areturn
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot  Name  Signature
            0    1     0  this  Lorg/eclipse/jgit/api/MergeResult;

  public org.eclipse.jgit.lib.ObjectId getBase();
    descriptor: ()Lorg/eclipse/jgit/lib/ObjectId;
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=1, locals=1, args_size=1
        start local 0 // org.eclipse.jgit.api.MergeResult this
         0: .line 397
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.base:Lorg/eclipse/jgit/lib/ObjectId;
            areturn
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot  Name  Signature
            0    1     0  this  Lorg/eclipse/jgit/api/MergeResult;

  public java.lang.String toString();
    descriptor: ()Ljava/lang/String;
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=7, locals=7, args_size=1
        start local 0 // org.eclipse.jgit.api.MergeResult this
         0: .line 404
            iconst_1
            istore 1 /* first */
        start local 1 // boolean first
         1: .line 405
            new java.lang.StringBuilder
            dup
            invokespecial java.lang.StringBuilder.<init>:()V
            astore 2 /* commits */
        start local 2 // java.lang.StringBuilder commits
         2: .line 406
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.mergedCommits:[Lorg/eclipse/jgit/lib/ObjectId;
            dup
            astore 6
            arraylength
            istore 5
            iconst_0
            istore 4
            goto 9
      StackMap locals: org.eclipse.jgit.api.MergeResult int java.lang.StringBuilder top int int org.eclipse.jgit.lib.ObjectId[]
      StackMap stack:
         3: aload 6
            iload 4
            aaload
            astore 3 /* commit */
        start local 3 // org.eclipse.jgit.lib.ObjectId commit
         4: .line 407
            iload 1 /* first */
            ifne 6
         5: .line 408
            aload 2 /* commits */
            ldc ", "
            invokevirtual java.lang.StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
            pop
            goto 7
         6: .line 410
      StackMap locals: org.eclipse.jgit.api.MergeResult int java.lang.StringBuilder org.eclipse.jgit.lib.ObjectId int int org.eclipse.jgit.lib.ObjectId[]
      StackMap stack:
            iconst_0
            istore 1 /* first */
         7: .line 411
      StackMap locals:
      StackMap stack:
            aload 2 /* commits */
            aload 3 /* commit */
            invokestatic org.eclipse.jgit.lib.ObjectId.toString:(Lorg/eclipse/jgit/lib/ObjectId;)Ljava/lang/String;
            invokevirtual java.lang.StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
            pop
        end local 3 // org.eclipse.jgit.lib.ObjectId commit
         8: .line 406
            iinc 4 1
      StackMap locals: org.eclipse.jgit.api.MergeResult int java.lang.StringBuilder top int int org.eclipse.jgit.lib.ObjectId[]
      StackMap stack:
         9: iload 4
            iload 5
            if_icmplt 3
        10: .line 414
            invokestatic org.eclipse.jgit.internal.JGitText.get:()Lorg/eclipse/jgit/internal/JGitText;
            getfield org.eclipse.jgit.internal.JGitText.mergeUsingStrategyResultedInDescription:Ljava/lang/String;
            iconst_5
            anewarray java.lang.Object
            dup
            iconst_0
        11: .line 415
            aload 2 /* commits */
            aastore
            dup
            iconst_1
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.base:Lorg/eclipse/jgit/lib/ObjectId;
            invokestatic org.eclipse.jgit.lib.ObjectId.toString:(Lorg/eclipse/jgit/lib/ObjectId;)Ljava/lang/String;
            aastore
            dup
            iconst_2
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.mergeStrategy:Lorg/eclipse/jgit/merge/MergeStrategy;
            invokevirtual org.eclipse.jgit.merge.MergeStrategy.getName:()Ljava/lang/String;
            aastore
            dup
            iconst_3
        12: .line 416
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.mergeStatus:Lorg/eclipse/jgit/api/MergeResult$MergeStatus;
            aastore
            dup
            iconst_4
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.description:Ljava/lang/String;
            ifnonnull 13
            ldc ""
            goto 14
      StackMap locals: org.eclipse.jgit.api.MergeResult int java.lang.StringBuilder
      StackMap stack: java.lang.String java.lang.Object[] java.lang.Object[] int
        13: new java.lang.StringBuilder
            dup
            ldc ", "
            invokespecial java.lang.StringBuilder.<init>:(Ljava/lang/String;)V
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.description:Ljava/lang/String;
            invokevirtual java.lang.StringBuilder.append:(Ljava/lang/String;)Ljava/lang/StringBuilder;
            invokevirtual java.lang.StringBuilder.toString:()Ljava/lang/String;
      StackMap locals: org.eclipse.jgit.api.MergeResult int java.lang.StringBuilder
      StackMap stack: java.lang.String java.lang.Object[] java.lang.Object[] int java.lang.String
        14: aastore
        15: .line 413
            invokestatic java.text.MessageFormat.format:(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String;
            areturn
        end local 2 // java.lang.StringBuilder commits
        end local 1 // boolean first
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot     Name  Signature
            0   16     0     this  Lorg/eclipse/jgit/api/MergeResult;
            1   16     1    first  Z
            2   16     2  commits  Ljava/lang/StringBuilder;
            4    8     3   commit  Lorg/eclipse/jgit/lib/ObjectId;

  public void setConflicts(java.util.Map<java.lang.String, int[][]>);
    descriptor: (Ljava/util/Map;)V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=2, locals=2, args_size=2
        start local 0 // org.eclipse.jgit.api.MergeResult this
        start local 1 // java.util.Map conflicts
         0: .line 426
            aload 0 /* this */
            aload 1 /* conflicts */
            putfield org.eclipse.jgit.api.MergeResult.conflicts:Ljava/util/Map;
         1: .line 427
            return
        end local 1 // java.util.Map conflicts
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot       Name  Signature
            0    2     0       this  Lorg/eclipse/jgit/api/MergeResult;
            0    2     1  conflicts  Ljava/util/Map<Ljava/lang/String;[[I>;
    Signature: (Ljava/util/Map<Ljava/lang/String;[[I>;)V
    MethodParameters:
           Name  Flags
      conflicts  

  public void addConflict(java.lang.String, int[][]);
    descriptor: (Ljava/lang/String;[[I)V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=3, locals=3, args_size=3
        start local 0 // org.eclipse.jgit.api.MergeResult this
        start local 1 // java.lang.String path
        start local 2 // int[][] conflictingRanges
         0: .line 438
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.conflicts:Ljava/util/Map;
            ifnonnull 2
         1: .line 439
            aload 0 /* this */
            new java.util.HashMap
            dup
            invokespecial java.util.HashMap.<init>:()V
            putfield org.eclipse.jgit.api.MergeResult.conflicts:Ljava/util/Map;
         2: .line 440
      StackMap locals:
      StackMap stack:
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.conflicts:Ljava/util/Map;
            aload 1 /* path */
            aload 2 /* conflictingRanges */
            invokeinterface java.util.Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
            pop
         3: .line 441
            return
        end local 2 // int[][] conflictingRanges
        end local 1 // java.lang.String path
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot               Name  Signature
            0    4     0               this  Lorg/eclipse/jgit/api/MergeResult;
            0    4     1               path  Ljava/lang/String;
            0    4     2  conflictingRanges  [[I
    MethodParameters:
                   Name  Flags
      path               
      conflictingRanges  

  public void addConflict(java.lang.String, org.eclipse.jgit.merge.MergeResult<?>);
    descriptor: (Ljava/lang/String;Lorg/eclipse/jgit/merge/MergeResult;)V
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=3, locals=9, args_size=3
        start local 0 // org.eclipse.jgit.api.MergeResult this
        start local 1 // java.lang.String path
        start local 2 // org.eclipse.jgit.merge.MergeResult lowLevelResult
         0: .line 452
            aload 2 /* lowLevelResult */
            invokevirtual org.eclipse.jgit.merge.MergeResult.containsConflicts:()Z
            ifne 2
         1: .line 453
            return
         2: .line 454
      StackMap locals:
      StackMap stack:
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.conflicts:Ljava/util/Map;
            ifnonnull 4
         3: .line 455
            aload 0 /* this */
            new java.util.HashMap
            dup
            invokespecial java.util.HashMap.<init>:()V
            putfield org.eclipse.jgit.api.MergeResult.conflicts:Ljava/util/Map;
         4: .line 456
      StackMap locals:
      StackMap stack:
            iconst_0
            istore 3 /* nrOfConflicts */
        start local 3 // int nrOfConflicts
         5: .line 458
            aload 2 /* lowLevelResult */
            invokevirtual org.eclipse.jgit.merge.MergeResult.iterator:()Ljava/util/Iterator;
            astore 5
            goto 9
      StackMap locals: org.eclipse.jgit.api.MergeResult java.lang.String org.eclipse.jgit.merge.MergeResult int top java.util.Iterator
      StackMap stack:
         6: aload 5
            invokeinterface java.util.Iterator.next:()Ljava/lang/Object;
            checkcast org.eclipse.jgit.merge.MergeChunk
            astore 4 /* mergeChunk */
        start local 4 // org.eclipse.jgit.merge.MergeChunk mergeChunk
         7: .line 459
            aload 4 /* mergeChunk */
            invokevirtual org.eclipse.jgit.merge.MergeChunk.getConflictState:()Lorg/eclipse/jgit/merge/MergeChunk$ConflictState;
            getstatic org.eclipse.jgit.merge.MergeChunk$ConflictState.FIRST_CONFLICTING_RANGE:Lorg/eclipse/jgit/merge/MergeChunk$ConflictState;
            invokevirtual org.eclipse.jgit.merge.MergeChunk$ConflictState.equals:(Ljava/lang/Object;)Z
            ifeq 9
         8: .line 460
            iinc 3 /* nrOfConflicts */ 1
        end local 4 // org.eclipse.jgit.merge.MergeChunk mergeChunk
         9: .line 458
      StackMap locals:
      StackMap stack:
            aload 5
            invokeinterface java.util.Iterator.hasNext:()Z
            ifne 6
        10: .line 463
            iconst_m1
            istore 4 /* currentConflict */
        start local 4 // int currentConflict
        11: .line 464
            iload 3 /* nrOfConflicts */
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.mergedCommits:[Lorg/eclipse/jgit/lib/ObjectId;
            arraylength
            iconst_1
            iadd
            multianewarray [[I 2
            astore 5 /* ret */
        start local 5 // int[][] ret
        12: .line 465
            aload 2 /* lowLevelResult */
            invokevirtual org.eclipse.jgit.merge.MergeResult.iterator:()Ljava/util/Iterator;
            astore 7
            goto 25
      StackMap locals: org.eclipse.jgit.api.MergeResult java.lang.String org.eclipse.jgit.merge.MergeResult int int int[][] top java.util.Iterator
      StackMap stack:
        13: aload 7
            invokeinterface java.util.Iterator.next:()Ljava/lang/Object;
            checkcast org.eclipse.jgit.merge.MergeChunk
            astore 6 /* mergeChunk */
        start local 6 // org.eclipse.jgit.merge.MergeChunk mergeChunk
        14: .line 467
            iconst_0
            istore 8 /* endOfChunk */
        start local 8 // int endOfChunk
        15: .line 468
            aload 6 /* mergeChunk */
            invokevirtual org.eclipse.jgit.merge.MergeChunk.getConflictState:()Lorg/eclipse/jgit/merge/MergeChunk$ConflictState;
            getstatic org.eclipse.jgit.merge.MergeChunk$ConflictState.FIRST_CONFLICTING_RANGE:Lorg/eclipse/jgit/merge/MergeChunk$ConflictState;
            invokevirtual org.eclipse.jgit.merge.MergeChunk$ConflictState.equals:(Ljava/lang/Object;)Z
            ifeq 21
        16: .line 469
            iload 4 /* currentConflict */
            iconst_m1
            if_icmple 18
        17: .line 472
            aload 5 /* ret */
            iload 4 /* currentConflict */
            aaload
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.mergedCommits:[Lorg/eclipse/jgit/lib/ObjectId;
            arraylength
            iload 8 /* endOfChunk */
            iastore
        18: .line 474
      StackMap locals: org.eclipse.jgit.api.MergeResult java.lang.String org.eclipse.jgit.merge.MergeResult int int int[][] org.eclipse.jgit.merge.MergeChunk java.util.Iterator int
      StackMap stack:
            iinc 4 /* currentConflict */ 1
        19: .line 475
            aload 6 /* mergeChunk */
            invokevirtual org.eclipse.jgit.merge.MergeChunk.getEnd:()I
            istore 8 /* endOfChunk */
        20: .line 476
            aload 5 /* ret */
            iload 4 /* currentConflict */
            aaload
            aload 6 /* mergeChunk */
            invokevirtual org.eclipse.jgit.merge.MergeChunk.getSequenceIndex:()I
            aload 6 /* mergeChunk */
            invokevirtual org.eclipse.jgit.merge.MergeChunk.getBegin:()I
            iastore
        21: .line 478
      StackMap locals:
      StackMap stack:
            aload 6 /* mergeChunk */
            invokevirtual org.eclipse.jgit.merge.MergeChunk.getConflictState:()Lorg/eclipse/jgit/merge/MergeChunk$ConflictState;
            getstatic org.eclipse.jgit.merge.MergeChunk$ConflictState.NEXT_CONFLICTING_RANGE:Lorg/eclipse/jgit/merge/MergeChunk$ConflictState;
            invokevirtual org.eclipse.jgit.merge.MergeChunk$ConflictState.equals:(Ljava/lang/Object;)Z
            ifeq 25
        22: .line 479
            aload 6 /* mergeChunk */
            invokevirtual org.eclipse.jgit.merge.MergeChunk.getEnd:()I
            iload 8 /* endOfChunk */
            if_icmple 24
        23: .line 480
            aload 6 /* mergeChunk */
            invokevirtual org.eclipse.jgit.merge.MergeChunk.getEnd:()I
            istore 8 /* endOfChunk */
        24: .line 481
      StackMap locals:
      StackMap stack:
            aload 5 /* ret */
            iload 4 /* currentConflict */
            aaload
            aload 6 /* mergeChunk */
            invokevirtual org.eclipse.jgit.merge.MergeChunk.getSequenceIndex:()I
            aload 6 /* mergeChunk */
            invokevirtual org.eclipse.jgit.merge.MergeChunk.getBegin:()I
            iastore
        end local 8 // int endOfChunk
        end local 6 // org.eclipse.jgit.merge.MergeChunk mergeChunk
        25: .line 465
      StackMap locals: org.eclipse.jgit.api.MergeResult java.lang.String org.eclipse.jgit.merge.MergeResult int int int[][] top java.util.Iterator
      StackMap stack:
            aload 7
            invokeinterface java.util.Iterator.hasNext:()Z
            ifne 13
        26: .line 484
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.conflicts:Ljava/util/Map;
            aload 1 /* path */
            aload 5 /* ret */
            invokeinterface java.util.Map.put:(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
            pop
        27: .line 485
            return
        end local 5 // int[][] ret
        end local 4 // int currentConflict
        end local 3 // int nrOfConflicts
        end local 2 // org.eclipse.jgit.merge.MergeResult lowLevelResult
        end local 1 // java.lang.String path
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot             Name  Signature
            0   28     0             this  Lorg/eclipse/jgit/api/MergeResult;
            0   28     1             path  Ljava/lang/String;
            0   28     2   lowLevelResult  Lorg/eclipse/jgit/merge/MergeResult<*>;
            5   28     3    nrOfConflicts  I
            7    9     4       mergeChunk  Lorg/eclipse/jgit/merge/MergeChunk;
           11   28     4  currentConflict  I
           12   28     5              ret  [[I
           14   25     6       mergeChunk  Lorg/eclipse/jgit/merge/MergeChunk;
           15   25     8       endOfChunk  I
    Signature: (Ljava/lang/String;Lorg/eclipse/jgit/merge/MergeResult<*>;)V
    MethodParameters:
                Name  Flags
      path            
      lowLevelResult  

  public java.util.Map<java.lang.String, int[][]> getConflicts();
    descriptor: ()Ljava/util/Map;
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=1, locals=1, args_size=1
        start local 0 // org.eclipse.jgit.api.MergeResult this
         0: .line 528
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.conflicts:Ljava/util/Map;
            areturn
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot  Name  Signature
            0    1     0  this  Lorg/eclipse/jgit/api/MergeResult;
    Signature: ()Ljava/util/Map<Ljava/lang/String;[[I>;

  public java.util.Map<java.lang.String, org.eclipse.jgit.merge.ResolveMerger$MergeFailureReason> getFailingPaths();
    descriptor: ()Ljava/util/Map;
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=1, locals=1, args_size=1
        start local 0 // org.eclipse.jgit.api.MergeResult this
         0: .line 539
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.failingPaths:Ljava/util/Map;
            areturn
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot  Name  Signature
            0    1     0  this  Lorg/eclipse/jgit/api/MergeResult;
    Signature: ()Ljava/util/Map<Ljava/lang/String;Lorg/eclipse/jgit/merge/ResolveMerger$MergeFailureReason;>;

  public java.util.List<java.lang.String> getCheckoutConflicts();
    descriptor: ()Ljava/util/List;
    flags: (0x0001) ACC_PUBLIC
    Code:
      stack=1, locals=1, args_size=1
        start local 0 // org.eclipse.jgit.api.MergeResult this
         0: .line 549
            aload 0 /* this */
            getfield org.eclipse.jgit.api.MergeResult.checkoutConflicts:Ljava/util/List;
            areturn
        end local 0 // org.eclipse.jgit.api.MergeResult this
      LocalVariableTable:
        Start  End  Slot  Name  Signature
            0    1     0  this  Lorg/eclipse/jgit/api/MergeResult;
    Signature: ()Ljava/util/List<Ljava/lang/String;>;
}
SourceFile: "MergeResult.java"
NestMembers:
  org.eclipse.jgit.api.MergeResult$MergeStatus  org.eclipse.jgit.api.MergeResult$MergeStatus$1  org.eclipse.jgit.api.MergeResult$MergeStatus$10  org.eclipse.jgit.api.MergeResult$MergeStatus$11  org.eclipse.jgit.api.MergeResult$MergeStatus$12  org.eclipse.jgit.api.MergeResult$MergeStatus$2  org.eclipse.jgit.api.MergeResult$MergeStatus$3  org.eclipse.jgit.api.MergeResult$MergeStatus$4  org.eclipse.jgit.api.MergeResult$MergeStatus$5  org.eclipse.jgit.api.MergeResult$MergeStatus$6  org.eclipse.jgit.api.MergeResult$MergeStatus$7  org.eclipse.jgit.api.MergeResult$MergeStatus$8  org.eclipse.jgit.api.MergeResult$MergeStatus$9
InnerClasses:
  public abstract Entry = java.util.Map$Entry of java.util.Map
  public abstract MergeStatus = org.eclipse.jgit.api.MergeResult$MergeStatus of org.eclipse.jgit.api.MergeResult
  public final ConflictState = org.eclipse.jgit.merge.MergeChunk$ConflictState of org.eclipse.jgit.merge.MergeChunk
  public final MergeFailureReason = org.eclipse.jgit.merge.ResolveMerger$MergeFailureReason of org.eclipse.jgit.merge.ResolveMerger