diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-18 17:15:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-18 17:15:16 -0400 |
| commit | ea7dc8c893299331684ac0f68b78e96ad037baef (patch) | |
| tree | 0953358a62c7c9e7dc7aa3de6c733d702f114606 /Assistant.hs | |
| parent | 845de8f36631f8bb18abba43d00e44fa38e91cbf (diff) | |
partial and incomplete automatic merging in direct mode
Handles our file right, but not theirs.
Diffstat (limited to 'Assistant.hs')
0 files changed, 0 insertions, 0 deletions