• Junio C Hamano's avatar
    Merge branch 'jc/read-tree' · d0a75a17
    Junio C Hamano authored
    * jc/read-tree:
      t6022: ignoring untracked files by merge-recursive when they do not matter
      merge-recursive: adjust to loosened "working file clobbered" check
      merge-recursive: make a few functions static.
      merge-recursive: use abbreviated commit object name.
      merge: loosen overcautious "working file will be lost" check.
    d0a75a17
merge-recursive.c 34.6 KB