![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 26 Jan 2007 09:11:10 +0000 (04:11 -0500) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 26 Jan 2007 09:11:10 +0000 (04:11 -0500) | ||
| commit | 5f39dbf64f5e57c6ab7b20ba8c397df1074bc30c | |
| tree | 0367b8088e70f16dc198d8fecbd8f6ad801ef6f7 | tree | snapshot |
| parent | dff7e88febf85b1b8b1b789cd7c99434b70fb19b | commit | diff |
git-gui: Don't allow merges in the middle of other things.
If the user is in the middle of a commit they have files which are
modified. These may conflict with any merge that they may want
to perform, which would cause problems if the user wants to abort
a bad merge as we wouldn't have a checkpoint to roll back onto.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
If the user is in the middle of a commit they have files which are
modified. These may conflict with any merge that they may want
to perform, which would cause problems if the user wants to abort
a bad merge as we wouldn't have a checkpoint to roll back onto.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| git-gui.sh | diff | blob | history |