log tests/test-merge-remove.t @ 27599:ad5966de3c9a

age author description
Wed, 23 Dec 2015 12:51:45 -0800 Siddharth Agarwal filemerge: default change/delete conflicts to 'leave unresolved' (BC)