diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-09 21:12:59 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-09 21:13:28 -0400 |
| commit | fc64015a7af4bbc531a1e4bc8741d86609b1f0bf (patch) | |
| tree | 37a136342381279aefeb96a26b9bd8bc7f806954 /Git/DiffTree.hs | |
| parent | af27920956c9ef59052662389bff1ba40efd1ea0 (diff) | |
fix union merge to call diff-index with -- after the ref
Otherwise, if there's a file in the repo with a name matching the ref,
git could get confused and the merge not work.
Diffstat (limited to 'Git/DiffTree.hs')
0 files changed, 0 insertions, 0 deletions