Merge branch 'rs/notes-merge-no-toctou'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 17:34:41 +0000 (10:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Jul 2016 17:34:41 +0000 (10:34 -0700)
commitd0b6966...3dc0a1aca8b7aa89dd0f95cda50d21f2
tree180fba4...17eac6d8cdc52d80ecc99edae01cd2abcopy hash to clipboard (tree)
parentc97268c...22077ba414f90f6ba357fab170bb3986copy hash to clipboard (diff)
parentdeb9c15...5c456b9d12ff05fdd2bec516dfb34ae4copy hash to clipboard (diff)
notes-merge.c