Mercurial > hg

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 22032: (0) -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip
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
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
less more | rev 22032: (0) -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip