log

age author description
Sun, 26 Aug 2018 16:42:28 -0400 Valentin Gatien-Baron resolve: add config to make hg resolve not re-merge by default
Sun, 26 Aug 2018 15:52:34 -0400 Valentin Gatien-Baron resolve: add a flag for the default behavior of re-merging