Mercurial
Mercurial
>
hg
>
mercurial-crew-with-dirclash
/ changelog
summary
|
shortlog
| changelog |
graph
|
tags
|
bookmarks
|
branches
|
files
|
gz
|
help
(0)
-1000
-300
-100
-30
-10
-3
+3
+10
+30
+100
+300
+1000
+3000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
Tue, 21 Feb 2006 15:48:19 -0600
hgmerge: improve "apps not found" message
changeset
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:19 -0600] rev 1773
hgmerge: improve "apps not found" message
Tue, 21 Feb 2006 15:48:16 -0600
hgmerge: logic changes
changeset
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:16 -0600] rev 1772
hgmerge: logic changes Details: - keep automatic merge conflicts in $LOCAL - do not assume that $EDITOR returns proper error code - fix a slight mistake in diff+patch merge success detection (it could succeed if the $EDITOR failed to run)
Tue, 21 Feb 2006 15:48:12 -0600
hgmerge: add and use ask_if_merged function
changeset
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> [Tue, 21 Feb 2006 15:48:12 -0600] rev 1771
hgmerge: add and use ask_if_merged function This patch, unlike the earlier ones, doesn't use unportable select builtin.
(0)
-1000
-300
-100
-30
-10
-3
+3
+10
+30
+100
+300
+1000
+3000
tip