5 Commits

Author	SHA1	Message	Date
Martin Geisler	93008b71a6	ui: refer to "hg help config" when no username is set	2009-11-07 22:13:09 +01:00
Martin Geisler	c3718b9d5b	commands: call ui.username carefully in debuginstall ... After 54b67f7bd5df, 'hg debuginstall' would abort halfway through if no username was set. We now catch and display the exception instead.	2009-11-07 01:46:27 +01:00
Matt Mackall	9d996cd13f	merge: allow smarter tool configuration ... Add [merge-tool] hgrc section with: <tool>.executable = name or path (<tool>) <tool>.args = args with $local/base/other/output ($local $base $other) <tool>.priority = priority (default 0) <tool>.binary = handles binary (False) <tool>.symlink = handles symlinks (False) <tool>.checkconflict = check for conflict markers (False) <tool>.premerge = try internal simplemerge (True if not binary or symlink) Four built-in tools: internal:{merge,local,other,fail} Add [merge-patterns] section of the form: <pattern> = <tool> Priority of settings is: HGMERGE merge-patterns ui:merge merge-tools by priority hgmerge, if it can be found Changes: unsuccessful merges leave .orig files	2008-02-03 19:29:05 -06:00
Matt Mackall	6665cfa7a3	Add some remedies and a username check to debuginstall	2006-12-10 01:05:00 -06:00
Matt Mackall	135cce014c	Add debuginstall command to do basic install tests	2006-12-10 00:05:47 -06:00