|
11cc08c1
|
2020-07-23T14:21:31
|
|
handle symlink conflicts by installing a file that contains conflict markers
|
|
e26bafba
|
2020-07-23T14:21:31
|
|
add cherrypick test for symlink conflict cases
This test accepts the current behaviour, even though the current behaviour
isn't ideal in some cases.
|
|
af57b12a
|
2020-07-23T14:21:30
|
|
add symlink support to 'got cherrypick'; test non-conflict cases only for now
|
|
e7303626
|
2020-05-14T19:27:44
|
|
add submodule tests
ok semarie
|
|
ceb466a7
|
2020-04-18T11:21:53
|
|
add a test for 'got cherrypick' with existing merge conflicts
|
|
a7648d7a
|
2019-06-02T21:35:20
|
|
consistently use leading upper-case for messages indicating success
|
|
03415a1a
|
2019-06-02T20:31:34
|
|
allow 'got cherrypick' with a root commit (adds all files in commit)
|
|
2b92fad7
|
2019-06-02T17:52:19
|
|
test and fix expected file status after 'got cherrypick'
|
|
234035bc
|
2019-06-01T13:35:47
|
|
add 'got cherrypick' command
|