Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
src/GitDiff.h
src/MainWindow.cpp
Merge remote-tracking branch 'refs/remotes/origin/master'
Project Tags None Referenced Files None Subscribers None
Description Merge remote-tracking branch 'refs/remotes/origin/master' Conflicts:
Details
Event Timeline
Merged Changes
|