git notes merge: List conflicting notes in notes merge commit message
authorJohan Herland <johan@herland.net>
Tue, 9 Nov 2010 21:49:53 +0000 (22:49 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:22:49 +0000 (13:22 -0800)
commit443259c...929c0041310e3c77946252cbfc3f787d
tree120f836...fdd0f0c55c08fca1ecae571a2d167750copy hash to clipboard (tree)
parent6abb365...efe364cf0375b5cdae2729af7562ed45copy hash to clipboard (diff)
builtin/notes.c
notes-merge.c
notes-merge.h
t/t3310-notes-merge-manual-resolve.sh