Age | Commit message (Expand) | Author |
---|---|---|
2014-02-04 | Test that emulates a strange filter implementation | Edward Thomson |
2014-02-04 | Tests merging staged files identical to result | Edward Thomson |
2014-02-04 | Tests merge when changes exist in workdir/index | Edward Thomson |
2014-01-25 | merge: rename _oid() -> id() | Carlos Martín Nieto |
2014-01-25 | index: rename an entry's id to 'id' | Carlos Martín Nieto |
2014-01-21 | Merge submodules | Edward Thomson |
2014-01-21 | Support union merges | Edward Thomson |
2014-01-21 | Remove the "merge none" flag | Edward Thomson |
2014-01-21 | Load merge.conflictstyle setting from config | Edward Thomson |
2014-01-21 | Introduce diff3 mode for checking out conflicts | Edward Thomson |
2014-01-21 | Don't try to merge binary files | Edward Thomson |
2014-01-21 | merge_file should use more aggressive levels | Edward Thomson |
2014-01-15 | refs: remove the _with_log differentiation | Carlos Martín Nieto |
2013-12-09 | Clean up warnings | Edward Thomson |
2013-12-03 | Bare naked merge and rebase | Edward Thomson |
2013-11-15 | Rename tests-clar to tests | Ben Straub |