diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-26 04:11:10 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-26 04:11:10 -0500 |
| commit | 5f39dbf64f5e57c6ab7b20ba8c397df1074bc30c (patch) | |
| tree | 0367b8088e70f16dc198d8fecbd8f6ad801ef6f7 /t/t4013/diff.format-patch_--inline_--stdout_initial..master | |
| parent | dff7e88febf85b1b8b1b789cd7c99434b70fb19b (diff) | |
| download | git-5f39dbf64f5e57c6ab7b20ba8c397df1074bc30c.tar.gz git-5f39dbf64f5e57c6ab7b20ba8c397df1074bc30c.zip | |
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>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..master')
0 files changed, 0 insertions, 0 deletions