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-merge-prompt.t
Mon, 09 Nov 2015 22:37:32 -0800
Siddharth Agarwal
test-merge-prompt.t: unset HGMERGE
file
|
diff
|
annotate
Mon, 02 Nov 2015 12:25:15 -0800
Siddharth Agarwal
test-merge-prompt.t: add tests for linear updates + change/delete conflicts
file
|
diff
|
annotate
Wed, 01 Oct 2014 01:04:18 +0200
Mads Kiilerich
ui: show prompt choice if input is not a tty but is forced to be interactive
file
|
diff
|
annotate
Mon, 04 Feb 2013 02:46:53 +0100
Mads Kiilerich
merge: don't indent "local changed %s which remote deleted" prompt
file
|
diff
|
annotate
Wed, 16 Nov 2011 03:45:14 +0100
Mads Kiilerich
tests: hide 'No such file or directory' messages
file
|
diff
|
annotate
Tue, 21 Sep 2010 16:00:02 -0500
Matt Mackall
tests: cleanup exit code handling in unified tests
file
|
diff
|
annotate
Fri, 17 Sep 2010 17:03:08 -0500
Matt Mackall
tests: fix a bunch of pointless #s in unified tests
file
|
diff
|
annotate
Sun, 12 Sep 2010 11:52:13 +0200
Adrian Buehlmann
tests: unify test-merge-prompt
file
|
diff
|
annotate
|
base
less
more
(0)
tip