projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f10c1c7 c8e23aa)
Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Wed, 4 Jul 2007 08:22:18 +0000 (04:22 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Wed, 4 Jul 2007 08:22:18 +0000 (04:22 -0400)
* maint:
  git-gui: Unlock the index when cancelling merge dialog


Trivial merge
Git—the stupid content tracker