Commit ebf48fd51b015826a4c8227d238ec8533b15476c

Stefan Sperling 2019-08-03T20:43:55

handle conflicted files passed to 'got stage'