Fri, 17 Oct 2014 11:01:05 -0400 |
Augie Fackler |
test-resolve.t: use redirection to /dev/null instead of grep -q
|
Wed, 08 Oct 2014 22:30:04 -0700 |
Martin von Zweigbergk |
resolve: run happily after conflict-free merge
|
Wed, 08 Oct 2014 22:16:18 -0700 |
Martin von Zweigbergk |
test-resolve: add tests for re-merge
|
Wed, 08 Oct 2014 22:19:08 -0700 |
Martin von Zweigbergk |
test-resolve: add more tests for in conflict-free states
|
Wed, 08 Oct 2014 21:07:30 -0700 |
Martin von Zweigbergk |
test-resolve: add test resolving one of two files
|
Wed, 08 Oct 2014 21:19:31 -0700 |
Martin von Zweigbergk |
test-resolve: clarify test descriptions and consistently use "should"
|
Thu, 16 Oct 2014 17:46:58 -0700 |
Pierre-Yves David |
revset-phases: prefetch attributes in phasesrelated revsets
|