Age | Commit message (Expand) | Author |
---|---|---|
2018-08-21 | tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>' | SZEDER Gábor |
2017-10-07 | t3308: create a real ref directory/file conflict | Jeff King |
2016-01-18 | notes: allow merging from arbitrary references | Jacob Keller |
2010-11-18 | git notes merge: Handle real, non-conflicting notes merges | Johan Herland |
2010-11-18 | git notes merge: Initial implementation handling trivial merges only | Johan Herland |