diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-10-16 15:37:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-10-16 15:37:06 -0400 |
| commit | 7373e83f6bf5674cbe7219f4e87773130f0ae2e3 (patch) | |
| tree | c9cbff74c61052aaf915377bfe32ceb7dbc23513 /Command/Direct.hs | |
| parent | 6b3d7e6ef94a2b81cdf814aaf409acf4da7b0ac7 (diff) | |
fix indirect mode conflict merge when only one side is annexed file
git-merge's creation of file~HEAD type files did not make this especially
nice to do.
Diffstat (limited to 'Command/Direct.hs')
0 files changed, 0 insertions, 0 deletions