git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
authorJohan Herland <johan@herland.net>
Sun, 14 Nov 2010 23:57:17 +0000 (00:57 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 21:22:53 +0000 (13:22 -0800)
commita6a0909...a08339afc8468d053ff978ed4662a1d5
tree915beb0...1f4fbe5fe5932b8188a1ac983c7ed786copy hash to clipboard (tree)
parent6cfd6a9...ea889707fa207ee2003010c3b56b2131copy hash to clipboard (diff)
Documentation/git-notes.txt
builtin/notes.c
notes-merge.c
notes-merge.h
notes.c
notes.h
t/t3309-notes-merge-auto-resolve.sh