File tree Expand file tree Collapse file tree 3 files changed +4
-4
lines changed
internal/runbits/buildscript Expand file tree Collapse file tree 3 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -85,10 +85,10 @@ func TestRealWorld(t *testing.T) {
8585 "```\n " +
8686 "<<<<<<< local\n " +
8787 "Project: https://platform.activestate.com/ActiveState-CLI/Merge?branch=main&commitID=d908a758-6a81-40d4-b0eb-87069cd7f07d\n " +
88- "Time: 2024-05-10T00:00:13.138Z \n " +
88+ "Time: 2024-05-10T00:00:13Z \n " +
8989 "=======\n " +
9090 "Project: https://platform.activestate.com/ActiveState-CLI/Merge?branch=main&commitID=f3263ee4-ac4c-41ee-b778-2585333f49f7\n " +
91- "Time: 2023-08-01T16:20:11.985Z \n " +
91+ "Time: 2023-08-01T16:20:11Z \n " +
9292 ">>>>>>> remote\n " +
9393 "```\n " + `
9494runtime = state_tool_artifacts_v1(
Original file line number Diff line number Diff line change 11```
22Project: https: // platform.activestate.com/ActiveState-CLI/Merge?branch=main&commitID=d908a758-6a81-40d4-b0eb-87069cd7f07d
3- Time: 2024 - 05 - 10T00: 00 : 13. 138Z
3+ Time: 2024 - 05 - 10T00: 00 : 13Z
44```
55
66runtime = state_tool_artifacts_v1(
Original file line number Diff line number Diff line change 11```
22Project: https: // platform.activestate.com/ActiveState-CLI/Merge?branch=main&commitID=f3263ee4-ac4c-41ee-b778-2585333f49f7
3- Time: 2023 - 08 - 01T16: 20 : 11. 985000Z
3+ Time: 2023 - 08 - 01T16: 20 : 11Z
44```
55
66runtime = state_tool_artifacts_v1(
You can’t perform that action at this time.
0 commit comments