Age | Commit message (Expand) | Author |
---|---|---|
2015-11-25 | merge: handle conflicts in recursive base building | Edward Thomson |
2015-11-25 | recursive: test conflict output during recursive merge | Edward Thomson |
2015-11-25 | merge tests: move expected data into own file | Edward Thomson |