summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-06-11 23:58:11 -0400
committerShawn O. Pearce <spearce@spearce.org>2007-06-11 23:58:11 -0400
commit03e1bed4a4887607ae90cd121cb4851d10ef2e8b (patch)
tree166e015cd8b842fd28ddb138faa2ff7213528294 /git-gui
parentaa751960178af04673f88adca4988f94ffd7f2dc (diff)
parent39fa2a983d55b37759b99e67f9f1892879efb775 (diff)
downloadgit-03e1bed4a4887607ae90cd121cb4851d10ef2e8b.tar.gz
Merge branch 'maint'
* maint: git-gui: Save geometry before the window layout is damaged git-gui: Give amend precedence to HEAD over MERGE_MSG
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions