Commit 05d47768caf6fec51fa85cb6275c9ba8324aead6

Edward Thomson 2014-03-10T22:30:41

Introduce git_merge_file for consumers