log

age author description
Sat, 05 Jul 2014 19:17:09 +0200 Pierre-Yves David push: move the list of obsmarker to push into the push operation
Fri, 04 Jul 2014 19:31:49 +0200 Pierre-Yves David push: explicitly encode a list of obsmarkers to push
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