Mercurial > hg
log
age | author | description |
---|---|---|
Mon, 04 Aug 2014 16:32:41 -0700 | Pierre-Yves David | merge-tools: add a `premerge=keep-merge3` config option |
Mon, 04 Aug 2014 16:58:39 -0700 | Pierre-Yves David | merge-tools: make premerge valid values extensible |
Mon, 04 Aug 2014 16:50:15 -0700 | Pierre-Yves David | mergetools: add a test for premerge --keep |
Mon, 04 Aug 2014 16:39:47 -0700 | Pierre-Yves David | test-merge-tools: introduce a "revision 4" that merges with conflict |