Heya,
On Sun, May 30, 2010 at 14:20, Ramkumar Ramachandra <artagnon@xxxxxxxxx> wrote:
> git diff-files --quiet --ignore-submodules || {
> - echo "You must edit all merge conflicts and then"
> - echo "mark them as resolved using git add"
> + echo "You must edit all merge conflicts and then" \
> + "mark them as resolved using 'git add'"
Why is this change not described in the commit message? :)
--
Cheers,
Sverre Rabbelier
--
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