]> git.proxmox.com Git - libgit2.git/commit
Allow for merges with whitespace discrepancies
authorJacques Germishuys <jacquesg@striata.com>
Mon, 9 Mar 2015 15:02:52 +0000 (17:02 +0200)
committerJacques Germishuys <jacquesg@striata.com>
Mon, 16 Mar 2015 07:53:27 +0000 (09:53 +0200)
commit45a86bbfd028a545a71d3e1ea5518d467be8b5aa
treeb5a3fdbc7576309927ecb58ea02a9804945516ec
parentd675982a15388d8c413acda139b4662062cf3286
Allow for merges with whitespace discrepancies
include/git2/merge.h
src/merge.c
src/merge_file.c