Age | Commit message (Expand) | Author |
---|---|---|
2020-08-11 | Collect merge-related tests to t64xx | Elijah Newren |
2015-03-20 | t: fix moderate &&-chain breakage | Jeff King |
2012-04-18 | builtin/merge.c: reduce parents early | Junio C Hamano |
2012-04-18 | merge tests: octopus with redundant parents | MichaĆ Kiedrowicz |
2009-10-25 | Use 'fast-forward' all over the place | Felipe Contreras |
2007-08-28 | git-merge: do up-to-date check also for all strategies | Junio C Hamano |