Re: [PATCH 11/18] revert: Save data for continuing after conflict resolution
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 27, 2011, 22:51 UTC
- Message-ID
- <7vy5zjmj61.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1311736755-24205-12-git-send-email-artagnon@gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
Show 12 quoted lines
> + if (!prefixcmp(start, "pick ")) {
> + action = CHERRY_PICK;
> + insn_len = strlen("pick");
> + p = start + insn_len + 1;
> + }
> + else if (!prefixcmp(start, "revert ")) {
> + action = REVERT;
> + insn_len = strlen("revert");
> + p = start + insn_len + 1;
> + }
> + else
> + return NULL;(style)
if (...) {
...
} else if (...) {
...
} else {
...
}