| commit | 443259cf929c0041310e3c77946252cbfc3f787d | |
| author | Johan Herland <johan@herland.net> | |
| Tue, 9 Nov 2010 21:49:53 +0000 (9 22:49 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Nov 2010 21:22:49 +0000 (17 13:22 -0800) | ||
| tree | 120f8360fdd0f0c55c08fca1ecae571a2d167750 | treesnapshot (tar.gz zip) |
| parent | 6abb3655efe364cf0375b5cdae2729af7562ed45 | commitdiff |
git notes merge: List conflicting notes in notes merge commit message
This brings notes merge in line with regular merge's behaviour.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Don't use C99 comments.
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This brings notes merge in line with regular merge's behaviour.
This patch has been improved by the following contributions:
- Ævar Arnfjörð Bjarmason: Don't use C99 comments.
Thanks-to: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/notes.c | diffblobblamehistory | |
| notes-merge.c | diffblobblamehistory | |
| notes-merge.h | diffblobblamehistory | |
| t/t3310-notes-merge-manual-resolve.sh | diffblobblamehistory |