diff options
| author | Robin Stocker <robin@nibor.org> | 2011-04-06 22:55:10 +0200 |
|---|---|---|
| committer | Robin Stocker <robin@nibor.org> | 2011-04-06 22:57:49 +0200 |
| commit | 5dbef3fa51053b37f68b44ed390cab6dc8336dcc (patch) | |
| tree | 3c45c0394a561fc091c1ad0c2239f10ef9d8b1e0 /org.eclipse.jgit.junit | |
| parent | 3151657404859454bdf60345c09b536d1269c0c8 (diff) | |
| download | jgit-5dbef3fa51053b37f68b44ed390cab6dc8336dcc.tar.gz jgit-5dbef3fa51053b37f68b44ed390cab6dc8336dcc.zip | |
Add "Conflicts" section to merge message on conflict
The same as with cherry-pick, the commit message of a merge should
include a "Conflicts" section when the merge resulted in conflicts.
Change-Id: I6261dc898262322924af5ca1bef841a654b0df55
Signed-off-by: Robin Stocker <robin@nibor.org>
Diffstat (limited to 'org.eclipse.jgit.junit')
0 files changed, 0 insertions, 0 deletions