| commit | 19c734ac75620eef7843ee60f200c0010f17f51f | |
| author | Constantine Plotnikov <Constantine.Plotnikov@jetbrains.com> | |
| Tue, 19 May 2009 10:03:00 +0000 (19 14:03 +0400) | ||
| committer | Constantine Plotnikov <Constantine.Plotnikov@jetbrains.com> | |
| Tue, 19 May 2009 10:03:00 +0000 (19 14:03 +0400) | ||
| tree | 52e37d68dcfff72ae461fe44245f69ba8423fd98 | treesnapshot (tar.gz zip) |
| parent | 100939708978eac28a62dc8be4f0e69310ea79d8 | commitdiff |
git4idea: IDEADEV-33049: merge dialog is now automatically shown after pull and merge action if there are conflicts
| plugins/git4idea/src/git4idea/merge/GitMergeUtil.java | diffblobblamehistory |