diff options
| author |  Johan Herland <johan@herland.net> | 2010-11-09 22:49:53 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-11-17 13:22:49 -0800 |
| commit | 443259cf929c0041310e3c77946252cbfc3f787d (patch) | |
| tree | 120f8360fdd0f0c55c08fca1ecae571a2d167750 /t/t7605-merge-resolve.sh | |
| parent | git notes merge: Manual conflict resolution, part 2/2 (diff) | |
| download | tgif-443259cf929c0041310e3c77946252cbfc3f787d.tar.xz | |
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>
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions