| Age | Commit message (Expand) | Author | Files | Lines |
|---|
| 2020-08-10 | Collect merge-related tests to t64xx | Elijah Newren | 1 | -195/+0 |
| 2018-05-08 | merge-recursive: fix overwriting dirty files involved in renames | Elijah Newren | 1 | -1/+1 |
| 2018-04-11 | Revert "Merge branch 'en/rename-directory-detection'" | Junio C Hamano | 1 | -1/+1 |
| 2018-02-27 | merge-recursive: fix overwriting dirty files involved in renames | Elijah Newren | 1 | -1/+1 |
| 2018-01-19 | Tighten and correct a few testcases for merging and cherry-picking | Elijah Newren | 1 | -1/+4 |
| 2016-07-13 | Merge branch 'ah/unpack-trees-advice-messages' | Junio C Hamano | 1 | -1/+1 |
| 2016-06-27 | unpack-trees: fix English grammar in do-this-before-that messages | Alex Henrie | 1 | -1/+1 |
| 2016-06-17 | tests: unpack-trees: update to use test_i18n* functions | Vasco Almeida | 1 | -1/+1 |
| 2013-06-07 | tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) | Johannes Sixt | 1 | -3/+2 |
| 2012-04-15 | merge overwrites unstaged changes in renamed file | Clemens Buchacher | 1 | -0/+9 |
| 2011-09-21 | unpack-trees: print "Aborting" to stderr | Michael J Gruber | 1 | -0/+1 |
| 2011-04-14 | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 | Junio C Hamano | 1 | -5/+2 |
| 2011-04-01 | Merge branch 'ab/i18n-st' | Junio C Hamano | 1 | -2/+8 |
| 2011-03-25 | merge: merge unborn index before setting ref | Jeff King | 1 | -0/+4 |
| 2011-03-25 | t7607: clean up stray untracked file | Jeff King | 1 | -1/+2 |
| 2011-03-25 | t7607: mark known breakage in test 11 as fixed | Jeff King | 1 | -1/+1 |
| 2011-03-09 | i18n: git-merge basic messages | Ævar Arnfjörð Bjarmason | 1 | -2/+8 |
| 2011-02-09 | Merge branch 'tr/merge-unborn-clobber' | Junio C Hamano | 1 | -0/+16 |
| 2010-11-29 | Merge branch 'cb/leading-path-removal' | Junio C Hamano | 1 | -23/+79 |
| 2010-11-24 | Merge branch 'cb/maint-orphan-merge-noclobber' | Junio C Hamano | 1 | -0/+16 |
| 2010-11-15 | use persistent memory for rejected paths | Clemens Buchacher | 1 | -3/+16 |
| 2010-11-15 | do not overwrite untracked during merge from unborn branch | Clemens Buchacher | 1 | -0/+16 |
| 2010-10-13 | do not overwrite files in leading path | Clemens Buchacher | 1 | -1/+1 |
| 2010-10-13 | t7607: add leading-path tests | Clemens Buchacher | 1 | -0/+51 |
| 2010-10-13 | t7607: use test-lib functions and check MERGE_HEAD | Clemens Buchacher | 1 | -23/+15 |
| 2010-08-25 | Exhibit merge bug that clobbers index&WT | Thomas Rast | 1 | -0/+16 |
| 2010-07-20 | Convert "! git" to "test_must_fail git" | Jared Hance | 1 | -6/+6 |
| 2008-12-15 | merge-recursive: do not clobber untracked working tree garbage | Junio C Hamano | 1 | -1/+1 |
| 2008-12-15 | modify/delete conflict resolution overwrites untracked file | Clemens Buchacher | 1 | -0/+87 |
