henrahmagix/henry-dotfiles — pull request #6 by henrahmagix (2012-11-11 18:35:47+00:00)
Title: Install - allow merge when diffs occur and "Overwrite?" is no

Here's an example where both local and git versions of a dotfile differ, and I would like a merge rather than an overwriting.
```bash
17a18,19
> cl = clone
> clp = clone -p
87,91d88
< [github]
<	user = henrahmagix
< [ghi]
<	token = foooooooooooooooooooooooooooo
< #export GHI_TOKEN="baaaaaaaaaaaaaaaaaaaaaar"

Overwrite gitconfig? n
```