Mercurial
Mercurial
>
hg
/ file revisions
summary
|
shortlog
|
changelog
|
graph
|
tags
|
bookmarks
|
branches
|
file
| revisions |
annotate
|
diff
|
comparison
|
rss
|
help
(0)
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
tests/test-merge9.out
Mon, 16 Mar 2009 16:58:41 -0500
Matt Mackall
resolve: keep .orig files
file
|
diff
|
annotate
Wed, 04 Mar 2009 13:06:16 -0600
Augie Fackler
merge: better error messages to lead users to hg update --clean to abandon merges.
file
|
diff
|
annotate
Fri, 19 Dec 2008 16:47:36 -0600
Matt Mackall
resolve: require -a switch to resolve all files
file
|
diff
|
annotate
Fri, 11 Apr 2008 12:52:56 -0500
Matt Mackall
resolve: new command
file
|
diff
|
annotate
Thu, 10 Apr 2008 15:02:24 -0500
Matt Mackall
merge: introduce mergestate
file
|
diff
|
annotate
Fri, 21 Mar 2008 11:06:02 +0100
Dirkjan Ochtman
warn about new heads on commit (issue842)
file
|
diff
|
annotate
Sun, 03 Feb 2008 19:29:05 -0600
Matt Mackall
merge: allow smarter tool configuration
file
|
diff
|
annotate
Wed, 01 Aug 2007 12:33:12 -0500
Matt Mackall
merge: do early copy to deal with issue636
file
|
diff
|
annotate
Fri, 22 Jun 2007 20:44:40 -0300
Alexis S. L. Carvalho
merge: fix small bug with a failed merge across a rename
file
|
diff
|
annotate
less
more
(0)
tip