Add list of files to merge conflict error#538

joshaber merged 1 commit intomasterlibgit2/objective-git:masterfrom

better_merge_conflict_error_messagelibgit2/objective-git:better_merge_conflict_error_messageCopy head branch name to clipboard