Skip to content
  • Orgad Shaneh's avatar
    Git: Force update file model when mergetool is done · 1dc90bcf
    Orgad Shaneh authored
    
    
    Flow:
    * Open a commit editor with unmerged files
    * Double-click an unmerged file
    * Resolve the conflicts with the mergetool, save and close it
    * The window is activated and the file model is refreshed immediately, before
      the mergetool process has exited.
    
    When the mergetool exits, repositoryChanged is emitted. Use it to refresh the
    file model again.
    
    Task-number: QTCREATORBUG-15569
    Change-Id: Ibce7301bc46fe3a5a378a4c15b882e1bb6bbf3c3
    Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
    1dc90bcf