|
2d24816b
|
2014-11-06T18:49:37
|
|
checkout_index: Remove stage 0 when checking out conflicts
|
|
|
8d3b2ee3
|
2014-10-11T20:56:50
|
|
Introduce failing test for conflict filtering in index
|
|
6affd71f
|
2014-01-03T17:38:34
|
|
git_checkout_opts -> git_checkout_options
|
|
9950bb4e
|
2014-01-24T20:23:17
|
|
diff: rename the file's 'oid' to 'id'
In the same vein as the previous commits in this series.
|
|
|
17820381
|
2013-11-14T14:05:52
|
|
Rename tests-clar to tests
|