log

age author description
Tue, 18 Nov 2014 17:36:24 -0800 Siddharth Agarwal patchbomb: don't honor whitespace and format-changing diffopts (BC)
Wed, 26 Nov 2014 11:45:21 -0800 Martin von Zweigbergk merge: add more thorough tests for --force
Wed, 26 Nov 2014 10:25:27 -0800 Martin von Zweigbergk merge: display modify/delete conflict prompts in sorted order