diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-06 17:32:04 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-06 17:32:04 -0400 |
| commit | 070b1a03392ab3962eb43f60f32fde5c1b9b70d2 (patch) | |
| tree | b6097608e2e12c026ca05164fc81148ede79cc23 /Annex/View.hs | |
| parent | 2caa1330b3abb4bb2ac60eb8b144046d03a1287b (diff) | |
fix auto merge conflict resolution when doing out of tree merge for adjusted branch
Diffstat (limited to 'Annex/View.hs')
0 files changed, 0 insertions, 0 deletions