log

age author description
Thu, 02 Aug 2012 13:51:34 +0200 Pierre-Yves David doc: improves merge-tools example with an overwrite of existing config
Mon, 12 May 2014 17:40:58 -0700 Pierre-Yves David help: add additional information in the merge-tools section of config help
Wed, 07 May 2014 00:13:22 +0200 Angel Ezquerra subrepo: use subrepo shortid method to generate subrepo diverged promptchoice