Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2018-08-21 | tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>' | 1 | -1/+1 | |
2017-10-07 | t3308: create a real ref directory/file conflict | 1 | -1/+1 | |
2016-01-17 | notes: allow merging from arbitrary references | 1 | -11/+11 | |
2010-11-17 | git notes merge: Handle real, non-conflicting notes merges | 1 | -0/+188 | |
2010-11-17 | git notes merge: Initial implementation handling trivial merges only | 1 | -0/+180 |