diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-04-17 09:53:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 09:53:35 -0700 |
| commit | c4e3cca1f71d34e69bdbfa0de0144ddb00f75505 (patch) | |
| tree | ea208e8b6d59f8a367af2886a381cb000d42713b /checkout-cache.c | |
| parent | 8f41523fc1a8cd127ff39fa111b3b5bb5105cc84 (diff) | |
| download | git-c4e3cca1f71d34e69bdbfa0de0144ddb00f75505.tar.gz | |
[PATCH] update-cache --remove marks the path merged.
When update-cache --remove is run, resolve unmerged state for
the path. This is consistent with the update-cache --add
behaviour. Essentially, the user is telling us how he wants to
resolve the merge by running update-cache.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Fixed to do the right thing at the end.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'checkout-cache.c')
0 files changed, 0 insertions, 0 deletions