summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2018-12-11 22:16:48 +1100
committerJesse Duffield <jessedduffield@gmail.com>2018-12-11 22:16:48 +1100
commita3656154906c1117f9c9bbe100aa585e43417897 (patch)
tree6247c687bde83aa32ccb79fb6e341189fb2116af /test
parent9489a9447396b30bca86ea3df201cacfdffdb1a9 (diff)
only use subprocess for merging, not rebasing
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions