| commit | 668f26fff610605d112fbedffae79917de948893 | |
| author | Miklos Vajna <vmiklos@frugalware.org> | |
| Fri, 3 Oct 2008 13:02:31 +0000 (3 15:02 +0200) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Fri, 3 Oct 2008 15:01:46 +0000 (3 08:01 -0700) | ||
| tree | 4251bf2b3f245dc1e58e68483f9d93387cde599e | treesnapshot (tar.gz zip) |
| parent | 52e8370bc7a71366b664ece0a9ec0b79d673a356 | commitdiff |
builtin-merge: refresh the index before calling a strategy
In case a file is touched but has no real changes then we just have to
update the index and should not error out.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
In case a file is touched but has no real changes then we just have to
update the index and should not error out.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| builtin-merge.c | diffblobblamehistory | |
| t/t7600-merge.sh | diffblobblamehistory |