diff options
| author | Bernard Leach <leachbj@bouncycastle.org> | 2011-04-29 19:42:10 +1000 |
|---|---|---|
| committer | Chris Aniszczyk <caniszczyk@gmail.com> | 2011-05-05 13:48:57 -0500 |
| commit | 298486a7c320629de12f9506e0133686a7382b01 (patch) | |
| tree | 4a3f545edd4fb769f89d33b4d071233a4da17d41 /.gitattributes | |
| parent | e435f7de7748081945b02a0896dc54f4d6cc053c (diff) | |
| download | jgit-298486a7c320629de12f9506e0133686a7382b01.tar.gz jgit-298486a7c320629de12f9506e0133686a7382b01.zip | |
IndexDiff: conflicting files aren't properly shown
Before this change any files in the conflicting set would
also be listed in the the other IndexDiff Sets which is
confusing. With this change a conflicting file will not
be included in any of the other sets.
Change-Id: Ife9f2652685220bcfddc1f9820423acdcd5acfdc
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions