diff options
| author |  Alex Riesen <raa.lkml@gmail.com> | 2007-04-26 21:13:49 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-04-26 16:11:39 -0700 |
| commit | 0d5e6c9781aae33795243452fd50663d17ec2b9d (patch) | |
| tree | 0448c4e964b66fe838c83f60b38f01464c9c9547 /Documentation/technical/trivial-merge.txt | |
| parent | Add a test for merging changed and rename-changed branches (diff) | |
| download | tgif-0d5e6c9781aae33795243452fd50663d17ec2b9d.tar.xz | |
Ignore merged status of the file-level merge
as it is not relevant for whether the result should be written.
Even if no real merge happened, there might be _no_ reason to
rewrite the working tree file. Maybe even more so.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions