diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2010-11-03 13:32:54 +0100 |
|---|---|---|
| committer | Christian Halstrick <christian.halstrick@sap.com> | 2010-11-03 13:37:45 +0100 |
| commit | f5076d8b041bc7d0e1497cacbec370237a5ccaf7 (patch) | |
| tree | e44d44306d16ecc39cc0c7017d335f26e07dcff1 /org.eclipse.jgit.pgm | |
| parent | 009507ca2eafe1c6218ca3779348452495dcd3a3 (diff) | |
| download | jgit-f5076d8b041bc7d0e1497cacbec370237a5ccaf7.tar.gz jgit-f5076d8b041bc7d0e1497cacbec370237a5ccaf7.zip | |
Add a test for merging deleted files
The JGit merge algorithm or the Merge Command may have problems with handling
deletions always correctly. Therefore one additional test is added to check
this.
Change-Id: Id6aa49136996b29047c340994fe7faba68858e8c
Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm')
0 files changed, 0 insertions, 0 deletions