diff options
| author |  Heiko Voigt <hvoigt@hvoigt.net> | 2011-05-14 18:26:30 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-05-14 10:57:51 -0700 |
| commit | 44ca0c8ed927c8e7525ceec412704ff9967ff6ac (patch) | |
| tree | 44d1a9e84289aff7a5f150f1e53c8e2c0779de28 /Documentation/git-diff-files.txt | |
| parent | Prepare for 1.7.5.2 (diff) | |
| download | tgif-44ca0c8ed927c8e7525ceec412704ff9967ff6ac.tar.xz | |
test that git status works with merge conflict in, .gitmodules
For example: Two users independently adding a submodule will result in a
merge conflict in .gitmodules. Since configuration of the status and
diff machinery depends on the file being parseable they currently
fail to produce useable output in case .gitmodules is marked with a
merge conflict.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-diff-files.txt')
0 files changed, 0 insertions, 0 deletions