git notes merge: Manual conflict resolution, part 2/2
authorJohan Herland <johan@herland.net>
Tue, 9 Nov 2010 21:49:52 +0000 (22:49 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:22:49 +0000 (13:22 -0800)
commit6abb365...efe364cf0375b5cdae2729af7562ed45
tree71cd673...57836ee63fd0a3ca6271dab5716d9454copy hash to clipboard (tree)
parent809f38c...abacdbeb7015fdeef03931568c7fdddacopy hash to clipboard (diff)
Documentation/git-notes.txt
builtin/notes.c
notes-merge.c
notes-merge.h
t/t3310-notes-merge-manual-resolve.sh