| commit | f206f2ea02d8705579043384b3926cb8307883f7 | |
| author | Jonas Fonseca <jonas.fonseca@gmail.com> | |
| Wed, 6 Aug 2014 01:24:53 +0000 (5 21:24 -0400) | ||
| committer | Jonas Fonseca <jonas.fonseca@gmail.com> | |
| Wed, 6 Aug 2014 01:24:53 +0000 (5 21:24 -0400) | ||
| tree | 601b3d0a2b6554d703a8704fb3c73af83ee534ef | treesnapshot (tar.gz zip) |
| parent | 213348a1e945bb4dec01a88caf112425415f481d | commitdiff |
Fix display of conflicts in the main view when 'show-changes' is enabled
The main view showed both staged and unstaged changes, but should only
show unstaged changes for the unmerged file.
The main view showed both staged and unstaged changes, but should only
show unstaged changes for the unmerged file.
| NEWS.adoc | diffblobblamehistory | |
| src/repo.c | diffblobblamehistory | |
| test/main/show-changes-test | diffblobblamehistory | |
| test/tools/setup-conflict.sh | [new file with mode: 0755] | blob |