aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorAnand Kumria <wildfire@progsoc.org>2008-08-10 19:26:26 +0100
committerJunio C Hamano <gitster@pobox.com>2008-08-11 18:57:03 -0700
commitbf9320f1512d7ad4a17a64cfe5a593bba5037b3e (patch)
treedf7026815808f5b3aa6717520c3c60dd8c04c775 /Documentation/git-merge-file.txt
parentb340fa43017437988e233ed4fd8dc00042614071 (diff)
downloadgit-bf9320f1512d7ad4a17a64cfe5a593bba5037b3e.tar.gz
git-bf9320f1512d7ad4a17a64cfe5a593bba5037b3e.tar.xz
Have a command that specifically invokes 'p4' (via system)
Similiar to our 'p4_read_pipe_lines' command, we can isolate specific changes to the invocation method in the one location with this change. Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions