diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-05-02 06:53:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-05-02 06:53:32 (GMT) |
| commit | ee28152d03f2cf4b5e3ebc25f7f03f9654d3aa0d (patch) | |
| tree | e07f35d350958651d7e76eea5117cca99341f3a4 /merge-base.c | |
| parent | 0ff5bf7cfcb20a6c2404fe7b9cc6ff18e47db812 (diff) | |
| download | git-ee28152d03f2cf4b5e3ebc25f7f03f9654d3aa0d.zip git-ee28152d03f2cf4b5e3ebc25f7f03f9654d3aa0d.tar.gz git-ee28152d03f2cf4b5e3ebc25f7f03f9654d3aa0d.tar.bz2 | |
Update git-merge-one-file-script.
With this change, git-merge-one-file-script ceases to smudge
files in the work tree when recording the trivial merge results
(conflicting auto-merge failure case does not touch the work
tree file as before).
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-base.c')
0 files changed, 0 insertions, 0 deletions