Thu, 10 Sep 2020 13:12:34 -0700 | Martin von Zweigbergk | graphlog: use '%' only if there are *unresolved* conflicts | file | diff | annotate |
Thu, 25 Jun 2020 13:37:56 -0700 | Martin von Zweigbergk | graft: leverage cmdutil.check_incompatible_arguments() for --abort/--stop | file | diff | annotate |
Thu, 25 Jun 2020 13:29:05 -0700 | Martin von Zweigbergk | graft: leverage cmdutil.check_incompatible_arguments() for --no-commit | file | diff | annotate |
Thu, 25 Jun 2020 13:27:37 -0700 | Martin von Zweigbergk | graft: leverage cmdutil.check_at_most_one_arg() for --abort/--stop/--continue | file | diff | annotate |
Tue, 14 Apr 2020 19:09:56 -0400 | Valentin Gatien-Baron | graft: exit 1 on conflicts, like merge | file | diff | annotate |
Tue, 28 Jan 2020 21:49:50 -0800 | Martin von Zweigbergk | graphlog: use '%' for other context in merge conflict | file | diff | annotate |
Fri, 27 Dec 2019 15:39:48 -0800 | Martin von Zweigbergk | tests: split out ~1/3 of test-graft.t | file | diff | annotate | base |