diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-18 15:04:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-18 15:04:44 -0400 |
| commit | 10d77d95f454a2fb2806c031a14344dd7cdea006 (patch) | |
| tree | b9ba63e2f844031d4fd1d8248e5b01e7b5be7902 /Annex/UUID.hs | |
| parent | 19e46a374225bc37131454774f20da4c6a7779d9 (diff) | |
direct mode merging works!
Automatic merge resoltion code needs to be fixed to preserve objects from
direct mode files.
Diffstat (limited to 'Annex/UUID.hs')
0 files changed, 0 insertions, 0 deletions