[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-
From: |
Ralf Wildenhues |
Subject: |
Re: [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-414-g3dffb01 |
Date: |
Mon, 8 Nov 2010 21:44:56 +0100 |
User-agent: |
Mutt/1.5.20 (2010-08-04) |
[ moving from automake-commit ]
Hi Stefano,
* Stefano Lattarini wrote on Sun, Nov 07, 2010 at 04:37:15PM CET:
> This is an automated email from the git hooks/post-receive script. It was
> generated because a ref change was pushed to the repository containing
> the project "GNU Automake".
[...]
> commit 1e460312d79fe15170e7519fb785e132ac7293fb
> Merge: 4555c81 657ba88
> Author: Stefano Lattarini <address@hidden>
> Date: Sun Nov 7 11:50:06 2010 +0100
>
> Merge branch 'tests-misc-fixes-1'
>
> Conflicts:
> tests/Makefile.am
> tests/Makefile.in
For what little it's worth, I tend to remove the "Conflicts:" section of
the generated merge commit log entry when I have successfully dealt with
any conflicts. It's no big deal either way really, but I find it more
distracting than helpful.
Cheers,
Ralf
- Re: [Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-414-g3dffb01,
Ralf Wildenhues <=