Fri, 18 Mar 2016 12:38:30 +0100 Olaf Wintermann added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options changeset | files
Thu, 17 Mar 2016 22:02:15 +0100 Olaf Wintermann automatically remove deleted conflict files from the db changeset | files
Thu, 17 Mar 2016 21:11:19 +0100 Olaf Wintermann added resolve-conflicts and delete-conflicts commands changeset | files
(0) -100 -30 -10 -3 +3 +10 +30 +100 +300 tip

mercurial