summaryrefslogtreecommitdiffstats
path: root/t/t4013/diff.format-patch_--inline_--stdout_initial..master
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-01-26 03:58:56 -0500
committerShawn O. Pearce <spearce@spearce.org>2007-01-26 03:58:56 -0500
commitee3cfb595415e2f076d5b90efba83088e5af961c (patch)
tree637bf5074eb115b35a0075250b6cd0fc78f59132 /t/t4013/diff.format-patch_--inline_--stdout_initial..master
parentce9735dfbd77ab7cbcb97ba8749b2f6eaa7f2527 (diff)
downloadgit-ee3cfb595415e2f076d5b90efba83088e5af961c.tar.gz
git-ee3cfb595415e2f076d5b90efba83088e5af961c.zip
git-gui: Update status bar during a merge.
I got slightly confused when I did two merges in a row, as the status bar said "merge completed successfully" while the second merge was still running. Now we show what branches are actively being merged. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master')
0 files changed, 0 insertions, 0 deletions