git notes merge: Handle real, non-conflicting notes merges
authorJohan Herland <johan@herland.net>
Sun, 14 Nov 2010 23:54:11 +0000 (00:54 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:21:34 +0000 (13:21 -0800)
commit2085b16...efdbb1dc081aa40c62eb8110a222731d
tree4496211...2a4f8ba7d76b393d09b888c5564e7c9fcopy hash to clipboard (tree)
parent5688184...d4d916a166ac4c6ba1803e5ceba9c44dcopy hash to clipboard (diff)
builtin/notes.c
notes-merge.c
notes-merge.h
t/t3308-notes-merge.sh