| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'en/merge-recursive' | Junio C Hamano | 2011-04-28 | 1 | -0/+63 |
|\ |
|
| * | merge-recursive: When we detect we can skip an update, actually skip it | Elijah Newren | 2011-03-02 | 1 | -1/+1 |
| * | t6022: New test checking for unnecessary updates of files in D/F conflicts | Elijah Newren | 2011-03-02 | 1 | -0/+33 |
| * | t6022: New test checking for unnecessary updates of renamed+modified files | Elijah Newren | 2011-03-02 | 1 | -0/+30 |
* | | Merge branch 'en/merge-recursive' | Junio C Hamano | 2010-11-29 | 1 | -0/+366 |
|\ \
| |/ |
|
| * | t6022: Use -eq not = to test output of wc -l | Brian Gernhardt | 2010-11-17 | 1 | -32/+32 |
| * | merge_content(): Check whether D/F conflicts are still present | Elijah Newren | 2010-09-29 | 1 | -4/+4 |
| * | conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts | Elijah Newren | 2010-09-29 | 1 | -1/+1 |
| * | conflict_rename_delete(): Check whether D/F conflicts are still present | Elijah Newren | 2010-09-29 | 1 | -2/+2 |
| * | merge-recursive: Delay content merging for renames | Elijah Newren | 2010-09-29 | 1 | -1/+1 |
| * | merge-recursive: Move handling of double rename of one file to two | Elijah Newren | 2010-09-29 | 1 | -1/+1 |
| * | t6022: Add tests for rename/rename combined with D/F conflicts | Elijah Newren | 2010-09-29 | 1 | -0/+79 |
| * | t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two) | Elijah Newren | 2010-09-29 | 1 | -0/+63 |
| * | t6022: Add tests with both rename source & dest involved in D/F conflicts | Elijah Newren | 2010-09-29 | 1 | -0/+38 |
| * | t6022: Add tests for reversing order of merges when D/F conflicts present | Elijah Newren | 2010-09-29 | 1 | -0/+58 |
| * | t6022: Add test combinations of {content conflict?, D/F conflict remains?} | Elijah Newren | 2010-09-29 | 1 | -0/+128 |
* | | t6022 (renaming merge): chain test commands with && | Jonathan Nieder | 2010-11-09 | 1 | -190/+92 |
|/ |
|
* | tests: use "test_cmp", not "diff", when verifying the result | Gary V. Vaughan | 2010-05-31 | 1 | -2/+2 |
* | Add a test for merging changed and rename-changed branches | Alex Riesen | 2007-04-25 | 1 | -0/+23 |
* | t6022: ignoring untracked files by merge-recursive when they do not matter | Junio C Hamano | 2006-10-27 | 1 | -23/+142 |
* | tests: merge-recursive is usable without Python | Junio C Hamano | 2006-10-27 | 1 | -6/+0 |
* | read-tree -m -u: do not overwrite or remove untracked working tree files. | Junio C Hamano | 2006-05-17 | 1 | -0/+1 |
* | Optionally work without python | Johannes Schindelin | 2006-02-18 | 1 | -0/+6 |
* | merge-recursive: conflicting rename case. | Junio C Hamano | 2005-12-21 | 1 | -0/+37 |
* | t/t6022: a new test for renaming merge. | Junio C Hamano | 2005-12-11 | 1 | -0/+164 |