Joey Hess
|
97d670b0d5
|
normalise associated files
Sometimes ./file will be passed in, and sometimes file; need to treat these
the same.
|
2012-12-19 12:44:24 -04:00 |
|
Joey Hess
|
05ec4587dd
|
partial and incomplete automatic merging in direct mode
Handles our file right, but not theirs.
|
2012-12-18 17:15:16 -04:00 |
|
Joey Hess
|
53dbcce645
|
direct mode merging works!
Automatic merge resoltion code needs to be fixed to preserve objects from
direct mode files.
|
2012-12-18 15:04:44 -04:00 |
|
Joey Hess
|
e7b8cb0063
|
direct mode committing
|
2012-12-12 19:20:38 -04:00 |
|