log

age author description
Wed, 23 Dec 2015 12:51:45 -0800 Siddharth Agarwal filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Wed, 23 Dec 2015 12:41:20 -0800 Siddharth Agarwal tests: explicitly request changed version in test-rebase-newancestor.t
Wed, 23 Dec 2015 12:41:20 -0800 Siddharth Agarwal tests: explicitly request changed version in c/d conflict in test-commit-amend.t