git notes merge: Initial implementation handling trivial merges only
authorJohan Herland <johan@herland.net>
Tue, 9 Nov 2010 21:49:46 +0000 (22:49 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:21:30 +0000 (13:21 -0800)
commit75ef3f4...5cc69b21bc825ed0e739030d77a4f077
tree0159ebb...0a52781b645de37059689c6e679176b2copy hash to clipboard (tree)
parent8ef313e...ec3b9b8ca47dce1fec632597aa34bedccopy hash to clipboard (diff)
Makefile
builtin/notes.c
notes-merge.c [new file with mode: 0644]
notes-merge.h [new file with mode: 0644]
t/t3308-notes-merge.sh [new file with mode: 0755]