Fuzzy match segment not shown entirely when Ctrl+Arrow/Num is typed 
http://sourceforge.net/p/omegat/bugs/720/

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6774 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Update SuperTMXMerge with ResolutionStrategy callback interface to control merge

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6775 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Fuzzy match segment not shown entirely when Ctrl+Arrow/Num is typed
https://sourceforge.net/p/omegat/bugs/720/

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6776 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Provide summary of merge changes on team sync commit

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6777 b0d8beef-cb45-0410-a8e4-c0d495c3b779
Fuzzy match segment not shown entirely when Ctrl+Arrow/Num is typed
https://sourceforge.net/p/omegat/bugs/720/

git-svn-id: svn+ssh://svn.code.sf.net/p/omegat/svn/trunk@6776 b0d8beef-cb45-0410-a8e4-c0d495c3b779
(cherry picked from commit 5a36e05)
Merge branch 'origin-master' into github-java7

Conflicts:
	src/org/omegat/gui/matches/MatchesTextArea.java
remove unused import