5 Commits

Author	SHA1	Message	Date
Matt Mackall	8d82cba09a	merge: introduce mergestate	2008-04-10 15:02:24 -05:00
Dirkjan Ochtman	3e3b0d62eb	warn about new heads on commit (issue842)	2008-03-21 11:06:02 +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	3f58de820d	merge: add debug diagnostics for findcopies	2007-10-04 19:44:37 -05:00
Alexis S. L. Carvalho	9248b0bde4	filecommit: don't forget the local parent on a merge with a local rename	2007-01-30 19:09:08 -02:00