Code

Wrap git_merge_file, take 2#664

Code

Merged

tiennou merged 5 commits intolibgit2:masterlibgit2/objective-git:masterfrom tiennou:conflict_marked_filetiennou/objective-git:conflict_marked_fileCopy head branch name to clipboardAug 17, 2018

+132

Commits

Commits on May 28, 2017

• Wrap git_merge_file

  alehed

  committed
  26a85b2

  Copy full SHA for 26a85b2

Commits on Jun 4, 2017

• Address comments and new test case

  alehed

  committed
  05bd5d4

  Copy full SHA for 05bd5d4

Commits on Jun 5, 2017

• Use trees in test instead of commits

  alehed

  committed
  831722b

  Copy full SHA for 831722b

Commits on Aug 17, 2018

• Merge branch 'master' into conflict_marked_file

  tiennou

  committed
  6f00cf0

  Copy full SHA for 6f00cf0

• Let NSString handle the string copy

  tiennou

  committed
  3bb0078

  Copy full SHA for 3bb0078