Mercurial > hg-stable
log
age | author | description |
---|---|---|
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 |
Tue, 05 Aug 2014 14:58:45 -0700 | Pierre-Yves David | merge: add an internal:merge3 tool |
Tue, 05 Aug 2014 15:09:54 -0700 | Pierre-Yves David | internal:merge: update documentation |
Tue, 05 Aug 2014 15:17:38 -0700 | Pierre-Yves David | filemerge: allow the formatting of three labels instead of two |
Tue, 05 Aug 2014 15:12:22 -0700 | Pierre-Yves David | filemerge: drop extra white space |