summaryrefslogtreecommitdiff
path: root/t/t3308-notes-merge.sh
AgeCommit message (Expand)Author
2018-08-21tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>'SZEDER Gábor
2017-10-07t3308: create a real ref directory/file conflictJeff King
2016-01-17notes: allow merging from arbitrary referencesJacob Keller
2010-11-17git notes merge: Handle real, non-conflicting notes mergesJohan Herland
2010-11-17git notes merge: Initial implementation handling trivial merges onlyJohan Herland