Mercurial > hg
log tests/test-merge-types.t @ 29481:5caa415aa48b
age | author | description |
---|---|---|
Tue, 02 Feb 2016 14:49:02 +0000 | Pierre-Yves David | update: warn about other topological heads on bare update |
Tue, 01 Dec 2015 09:48:38 -0800 | Siddharth Agarwal | filemerge: default regular prompts to 'leave unresolved' (BC) |
Mon, 30 Nov 2015 11:17:18 -0800 | Siddharth Agarwal | filemerge: add a 'leave unresolved' option to regular prompts |