Mercurial > hg
graph
-
test-merge5: remove obsolete '-y' and its motivating commentThu, 09 Oct 2014 16:57:45 -0700, by Martin von Zweigbergk
-
test-resolve.t: use redirection to /dev/null instead of grep -qFri, 17 Oct 2014 11:01:05 -0400, by Augie Fackler
-
resolve: run happily after conflict-free mergeWed, 08 Oct 2014 22:30:04 -0700, by Martin von Zweigbergk
-
test-resolve: add tests for re-mergeWed, 08 Oct 2014 22:16:18 -0700, by Martin von Zweigbergk
-
test-resolve: add more tests for in conflict-free statesWed, 08 Oct 2014 22:19:08 -0700, by Martin von Zweigbergk
-
test-resolve: add test resolving one of two filesWed, 08 Oct 2014 21:07:30 -0700, by Martin von Zweigbergk