Code

Basic file merging#672

Code

Open

tiennou wants to merge 2 commits intolibgit2:masterlibgit2/objective-git:masterfrom tiennou:feature/file-mergingtiennou/objective-git:feature/file-mergingCopy head branch name to clipboard

+454-107

Commits

Commits on Mar 24, 2019

• Wrap the basic file merging mechanisms

  tiennou

  committed
  4057f02

  Copy full SHA for 4057f02

• Update the old merge method to go through the new support

  Show description for e0103df
  tiennou

  committed
  e0103df

  Copy full SHA for e0103df