Commit History

Author SHA1 Message Date
  morganamilo 06406d7cee More formatting tweaks 7 years ago
  morganamilo 191b5ebe47 Make colours more consistent and less ott 7 years ago
  morganamilo f018c0c200 Add missing err check 7 years ago
  morganamilo 7fd2a74bd2 Lint 7 years ago
  morganamilo 0c0cd4f883 Add utils.go 7 years ago
  morganamilo d5015b3fe8 Add breif comments for functions in conflicts.go 7 years ago
  morganamilo 4a8ec944bf Move conflict checking to its own file 7 years ago