David Aguilar <davvid@xxxxxxxxx> writes:
> + if base_present; then
> + checkout_staged_file 1 "$MERGED" "$BASE"
> + else
> + :>"$BASE"
Just a style, but please write this as either one of the following:
>"$BASE"
: >"$BASE"
I tend to prefer the former, but if you have to write a command, we want
to see a SP before the redirection (and no SP before the redirect target).
> + fi
> local_present && checkout_staged_file 2 "$MERGED" "$LOCAL"
> remote_present && checkout_staged_file 3 "$MERGED" "$REMOTE"
Sorry to be ping-pong-ing like this, but wouldn't we have a similar issue
when LOCAL or REMOTE does not exist (e.g. "they modified, we removed")?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html