Giving users the ability to dynamically set runtime ENV vars

Also moving `test_merge` logic from `Cli/Cli` into git_helper